Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 622ccdf1 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

ipv6: Never schedule DAD timer on dead address 



This patch ensures that all places that schedule the DAD timer
look at the address state in a safe manner before scheduling the
timer.  This ensures that we don't end up with pending timers
after deleting an address.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f2344a13

net/ipv6/addrconf.c

+8 −2
Original line number Diff line number Diff line
@@ -2853,10 +2853,10 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags) 
	net_srandom(ifp->addr.s6_addr32[3]);



	read_lock_bh(&idev->lock);

	spin_lock(&ifp->lock);

	if (ifp->state == INET6_IFADDR_STATE_DEAD)

		goto out;



	spin_lock(&ifp->lock);

	if (dev->flags&(IFF_NOARP|IFF_LOOPBACK) ||

	    idev->cnf.accept_dad < 1 ||

	    !(ifp->flags&IFA_F_TENTATIVE) ||
@@ -2890,8 +2890,8 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags) 
		ip6_ins_rt(ifp->rt);



	addrconf_dad_kick(ifp);

	spin_unlock(&ifp->lock);

out:

	spin_unlock(&ifp->lock);

	read_unlock_bh(&idev->lock);

}
@@ -2911,6 +2911,12 @@ static void addrconf_dad_timer(unsigned long data) 
	}



	spin_lock(&ifp->lock);

	if (ifp->state == INET6_IFADDR_STATE_DEAD) {

		spin_unlock(&ifp->lock);

		read_unlock(&idev->lock);

		goto out;

	}



	if (ifp->probes == 0) {

		/*

		 * DAD was successful