Skip to content

Commit

Permalink
ipv6: do not call ndisc_send_rs() with write lock
Browse files Browse the repository at this point in the history
Because vxlan module will call ip6_dst_lookup() in TX path,
which will hold write lock. So we have to release this write lock
before calling ndisc_send_rs(), otherwise could deadlock.

Reviewed-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Cong Wang authored and davem330 committed Sep 1, 2013
1 parent 034dfc5 commit caf92bc
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions net/ipv6/addrconf.c
Original file line number Diff line number Diff line change
Expand Up @@ -3090,6 +3090,7 @@ static int addrconf_ifdown(struct net_device *dev, int how)
static void addrconf_rs_timer(unsigned long data)
{
struct inet6_dev *idev = (struct inet6_dev *)data;
struct net_device *dev = idev->dev;
struct in6_addr lladdr;

write_lock(&idev->lock);
Expand All @@ -3104,12 +3105,14 @@ static void addrconf_rs_timer(unsigned long data)
goto out;

if (idev->rs_probes++ < idev->cnf.rtr_solicits) {
if (!__ipv6_get_lladdr(idev, &lladdr, IFA_F_TENTATIVE))
ndisc_send_rs(idev->dev, &lladdr,
write_unlock(&idev->lock);
if (!ipv6_get_lladdr(dev, &lladdr, IFA_F_TENTATIVE))
ndisc_send_rs(dev, &lladdr,
&in6addr_linklocal_allrouters);
else
goto out;
goto put;

write_lock(&idev->lock);
/* The wait after the last probe can be shorter */
addrconf_mod_rs_timer(idev, (idev->rs_probes ==
idev->cnf.rtr_solicits) ?
Expand All @@ -3125,6 +3128,7 @@ static void addrconf_rs_timer(unsigned long data)

out:
write_unlock(&idev->lock);
put:
in6_dev_put(idev);
}

Expand Down

0 comments on commit caf92bc

Please sign in to comment.