[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>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 510220f2ae8b..d805241e439c 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);
 }