ipv6: do not call ndisc_send_rs() with write lock (caf92bc4) · Commits · 戴 / test

net/ipv6/addrconf.c

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3090,6 +3090,7 @@ static int addrconf_ifdown(struct net_device *dev, int how)
	static void addrconf_rs_timer(unsigned long data)		static void addrconf_rs_timer(unsigned long data)
	{		{
	struct inet6_dev idev = (struct inet6_dev )data;		struct inet6_dev idev = (struct inet6_dev )data;
			struct net_device *dev = idev->dev;
	struct in6_addr lladdr;		struct in6_addr lladdr;

	write_lock(&idev->lock);		write_lock(&idev->lock);
	@@ -3104,12 +3105,14 @@ static void addrconf_rs_timer(unsigned long data)
	goto out;		goto out;

	if (idev->rs_probes++ < idev->cnf.rtr_solicits) {		if (idev->rs_probes++ < idev->cnf.rtr_solicits) {
	if (!__ipv6_get_lladdr(idev, &lladdr, IFA_F_TENTATIVE))		write_unlock(&idev->lock);
	ndisc_send_rs(idev->dev, &lladdr,		if (!ipv6_get_lladdr(dev, &lladdr, IFA_F_TENTATIVE))
			ndisc_send_rs(dev, &lladdr,
	&in6addr_linklocal_allrouters);		&in6addr_linklocal_allrouters);
	else		else
	goto out;		goto put;

			write_lock(&idev->lock);
	/* The wait after the last probe can be shorter */		/* The wait after the last probe can be shorter */
	addrconf_mod_rs_timer(idev, (idev->rs_probes ==		addrconf_mod_rs_timer(idev, (idev->rs_probes ==
	idev->cnf.rtr_solicits) ?		idev->cnf.rtr_solicits) ?
	@@ -3125,6 +3128,7 @@ static void addrconf_rs_timer(unsigned long data)

	out:		out:
	write_unlock(&idev->lock);		write_unlock(&idev->lock);
			put:
	in6_dev_put(idev);		in6_dev_put(idev);
	}		}