Skip to content

Commit

Permalink
[IPV6]: Fix addrconf dead lock.
Browse files Browse the repository at this point in the history
We need to release idev->lcok before we call addrconf_dad_stop().
It calls ipv6_addr_del(), which will hold idev->lock.

Bug spotted by Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp>.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
YOSHIFUJI Hideaki authored and David S. Miller committed Dec 27, 2005
1 parent 79cac2a commit 6732bad
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions net/ipv6/addrconf.c
Original file line number Diff line number Diff line change
Expand Up @@ -2467,19 +2467,20 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags)
return;
}

if (idev->if_flags & IF_READY) {
addrconf_dad_kick(ifp);
spin_unlock_bh(&ifp->lock);
} else {
if (!(idev->if_flags & IF_READY)) {
spin_unlock_bh(&ifp->lock);
read_unlock_bh(&idev->lock);
/*
* If the defice is not ready:
* - keep it tentative if it is a permanent address.
* - otherwise, kill it.
*/
in6_ifa_hold(ifp);
addrconf_dad_stop(ifp);
return;
}
addrconf_dad_kick(ifp);
spin_unlock_bh(&ifp->lock);
out:
read_unlock_bh(&idev->lock);
}
Expand Down

0 comments on commit 6732bad

Please sign in to comment.