Unverified Commit 5af74874 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2348 net: ipv4: fix one memleak in __inet_del_ifa() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/B7HODRD53T2RPFYFD7CJBUVJA6B2THV2/ 
 
https://gitee.com/openeuler/kernel/issues/I869PY 
 
Link:https://gitee.com/openeuler/kernel/pulls/2348

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 7799a03c 36d58055

net/ipv4/devinet.c

+5 −5
Original line number Diff line number Diff line
@@ -351,14 +351,14 @@ static void __inet_del_ifa(struct in_device *in_dev, 
{

	struct in_ifaddr *promote = NULL;

	struct in_ifaddr *ifa, *ifa1;

	struct in_ifaddr *last_prim;

	struct in_ifaddr __rcu **last_prim;

	struct in_ifaddr *prev_prom = NULL;

	int do_promote = IN_DEV_PROMOTE_SECONDARIES(in_dev);



	ASSERT_RTNL();



	ifa1 = rtnl_dereference(*ifap);

	last_prim = rtnl_dereference(in_dev->ifa_list);

	last_prim = ifap;

	if (in_dev->dead)

		goto no_promotions;
@@ -372,7 +372,7 @@ static void __inet_del_ifa(struct in_device *in_dev, 
		while ((ifa = rtnl_dereference(*ifap1)) != NULL) {

			if (!(ifa->ifa_flags & IFA_F_SECONDARY) &&

			    ifa1->ifa_scope <= ifa->ifa_scope)

				last_prim = ifa;

				last_prim = &ifa->ifa_next;



			if (!(ifa->ifa_flags & IFA_F_SECONDARY) ||

			    ifa1->ifa_mask != ifa->ifa_mask ||
@@ -436,9 +436,9 @@ static void __inet_del_ifa(struct in_device *in_dev, 


			rcu_assign_pointer(prev_prom->ifa_next, next_sec);



			last_sec = rtnl_dereference(last_prim->ifa_next);

			last_sec = rtnl_dereference(*last_prim);

			rcu_assign_pointer(promote->ifa_next, last_sec);

			rcu_assign_pointer(last_prim->ifa_next, promote);

			rcu_assign_pointer(*last_prim, promote);

		}



		promote->ifa_flags &= ~IFA_F_SECONDARY;