Unverified Commit 0e80669c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2349 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/BKWV65LMTRRWYPECOIS3F5IDZUSSNGFY/ 
 
https://gitee.com/openeuler/kernel/issues/I869PY 
 
Link:https://gitee.com/openeuler/kernel/pulls/2349

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 5906512f 6e992dc4

net/ipv4/devinet.c

+5 −4
Original line number Diff line number Diff line
@@ -341,12 +341,13 @@ static void __inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap, 
{

	struct in_ifaddr *promote = NULL;

	struct in_ifaddr *ifa, *ifa1 = *ifap;

	struct in_ifaddr *last_prim = in_dev->ifa_list;

	struct in_ifaddr **last_prim;

	struct in_ifaddr *prev_prom = NULL;

	int do_promote = IN_DEV_PROMOTE_SECONDARIES(in_dev);



	ASSERT_RTNL();



	last_prim = ifap;

	if (in_dev->dead)

		goto no_promotions;
@@ -360,7 +361,7 @@ static void __inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap, 
		while ((ifa = *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 ||
@@ -420,8 +421,8 @@ static void __inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap, 


		if (prev_prom) {

			prev_prom->ifa_next = promote->ifa_next;

			promote->ifa_next = last_prim->ifa_next;

			last_prim->ifa_next = promote;

			promote->ifa_next = *last_prim;

			*last_prim = promote;

		}



		promote->ifa_flags &= ~IFA_F_SECONDARY;