Unverified Commit 7f59603f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9499 ipv6: fix race condition between ipv6_get_ifaddr and ipv6_del_addr 

Merge Pull Request from: @ci-robot 
 
PR sync from: Dong Chenchen <dongchenchen2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ZY4EAVK2DMOJ3SSZHEP73ZOQVK2CGI4M/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9QRPL 
 
Link:https://gitee.com/openeuler/kernel/pulls/9499

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 59c90233 3b2d9a75

include/net/addrconf.h

+4 −0
Original line number Diff line number Diff line
@@ -429,6 +429,10 @@ static inline void in6_ifa_hold(struct inet6_ifaddr *ifp) 
	refcount_inc(&ifp->refcnt);

}



static inline bool in6_ifa_hold_safe(struct inet6_ifaddr *ifp)

{

	return refcount_inc_not_zero(&ifp->refcnt);

}



/*

 *	compute link-local solicited-node multicast address

net/ipv6/addrconf.c

+4 −3
Original line number Diff line number Diff line
@@ -2033,12 +2033,13 @@ struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, const struct in6_addr *add 
		if (ipv6_addr_equal(&ifp->addr, addr)) {

			if (!dev || ifp->idev->dev == dev ||

			    !(ifp->scope&(IFA_LINK|IFA_HOST) || strict)) {

				if (in6_ifa_hold_safe(ifp)) {

					result = ifp;

				in6_ifa_hold(ifp);

					break;

				}

			}

		}

	}

	rcu_read_unlock();



	return result;