lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[IPV6]: Fix dead lock.

Browse Source 
We need to relesae ifp->lock before we call addrconf_dad_stop(),
which will hold ifp->lock.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
YOSHIFUJI Hideaki
2005-12-23 11:23:21 -08:00
committed by David S. Miller
parent c162eeaa21
commit 3dd3bf8357
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/ipv6/addrconf.c
View File

@@ -2467,9 +2467,11 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags)
return; return;
} }
if (idev->if_flags & IF_READY) if (idev->if_flags & IF_READY) {
addrconf_dad_kick(ifp); addrconf_dad_kick(ifp);
else { spin_unlock_bh(&ifp->lock);
} else {
spin_unlock_bh(&ifp->lock);
/* /*
* If the defice is not ready: * If the defice is not ready:
* - keep it tentative if it is a permanent address. * - keep it tentative if it is a permanent address.
@@ -2478,8 +2480,6 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags)
in6_ifa_hold(ifp); in6_ifa_hold(ifp);
addrconf_dad_stop(ifp); addrconf_dad_stop(ifp);
} }
spin_unlock_bh(&ifp->lock);
out: out:
read_unlock_bh(&idev->lock); read_unlock_bh(&idev->lock);
} }