Commit a8594c95 authored by Yue Haibing's avatar Yue Haibing Committed by Paolo Abeni
Browse files

ipv6: mcast: Avoid a duplicate pointer check in mld_del_delrec() 



Avoid duplicate non-null pointer check for pmc in mld_del_delrec().
No functional changes.

Signed-off-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@google.com>
Link: https://patch.msgid.link/20250714081949.3109947-1-yuehaibing@huawei.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 06baf9bf

net/ipv6/mcast.c

+25 −27
Original line number Diff line number Diff line
@@ -789,14 +789,13 @@ static void mld_del_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im) 
			break;

		pmc_prev = pmc;

	}

	if (pmc) {

	if (!pmc)

		return;

	if (pmc_prev)

		rcu_assign_pointer(pmc_prev->next, pmc->next);

	else

		rcu_assign_pointer(idev->mc_tomb, pmc->next);

	}



	if (pmc) {

	im->idev = pmc->idev;

	if (im->mca_sfmode == MCAST_INCLUDE) {

		tomb = rcu_replace_pointer(im->mca_tomb,
@@ -817,7 +816,6 @@ static void mld_del_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im) 
	ip6_mc_clear_src(pmc);

	kfree_rcu(pmc, rcu);

}

}



static void mld_clear_delrec(struct inet6_dev *idev)

{