summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2005-12-23 11:23:21 -0800
committerDavid S. Miller <davem@davemloft.net>2005-12-23 11:23:21 -0800
commit3dd3bf83574e38578fc9741c0e23e4fa7f7ff96e (patch)
treefb9ccc01f478161d20b45040f28419b13ba5c07c /net
parentc162eeaa21fde6c27112690f5bc0a461a9f1763e (diff)
downloadlinux-3.10-3dd3bf83574e38578fc9741c0e23e4fa7f7ff96e.tar.gz
linux-3.10-3dd3bf83574e38578fc9741c0e23e4fa7f7ff96e.tar.bz2
linux-3.10-3dd3bf83574e38578fc9741c0e23e4fa7f7ff96e.zip
[IPV6]: Fix dead lock.
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>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/addrconf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 510220f2ae8..d805241e439 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2467,9 +2467,11 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags)
return;
}
- if (idev->if_flags & IF_READY)
+ if (idev->if_flags & IF_READY) {
addrconf_dad_kick(ifp);
- else {
+ spin_unlock_bh(&ifp->lock);
+ } else {
+ spin_unlock_bh(&ifp->lock);
/*
* If the defice is not ready:
* - 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);
addrconf_dad_stop(ifp);
}
-
- spin_unlock_bh(&ifp->lock);
out:
read_unlock_bh(&idev->lock);
}