projects/linux·commit 6732bade

[IPV6]: Fix addrconf dead lock.

6732bade · YOSHIFUJI Hideaki <[email protected]> · 2005-12-27 13:35:15 -08:00

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 <[email protected]>.

Signed-off-by: YOSHIFUJI Hideaki <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Commit
6732badee0dad467fcc9dd0168af8677b2b1bc2f
Parents
79cac2a2

Changes

1 files changed · +5 −4

FileStatusAddDelContent
net/ipv6/addrconf.cmodified+5−4View file

net/ipv6/addrconf.c

View file
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 2a6439e..a60585f 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2467,11 +2467,9 @@ 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.
@@ -2479,7 +2477,10 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags)
*/
in6_ifa_hold(ifp);
addrconf_dad_stop(ifp);
+ return;
}
+ addrconf_dad_kick(ifp);
+ spin_unlock_bh(&ifp->lock);
out:
read_unlock_bh(&idev->lock);
}