Skip to content

Commit

Permalink
ndisc: Update neigh->updated with write lock.
Browse files Browse the repository at this point in the history
neigh->nud_state and neigh->updated are under protection of
neigh->lock.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
YOSHIFUJI Hideaki / 吉藤英明 authored and David S. Miller committed Jan 17, 2013
1 parent cbf1de7 commit 7ff74a5
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions net/ipv6/route.c
Original file line number Diff line number Diff line change
Expand Up @@ -499,22 +499,26 @@ static void rt6_probe(struct rt6_info *rt)
* to no more than one per minute.
*/
neigh = rt ? rt->n : NULL;
if (!neigh || (neigh->nud_state & NUD_VALID))
if (!neigh)
return;
write_lock_bh(&neigh->lock);
if (neigh->nud_state & NUD_VALID) {
write_unlock_bh(&neigh->lock);
return;
read_lock_bh(&neigh->lock);
}
if (!(neigh->nud_state & NUD_VALID) &&
time_after(jiffies, neigh->updated + rt->rt6i_idev->cnf.rtr_probe_interval)) {
struct in6_addr mcaddr;
struct in6_addr *target;

neigh->updated = jiffies;
read_unlock_bh(&neigh->lock);
write_unlock_bh(&neigh->lock);

target = (struct in6_addr *)&neigh->primary_key;
addrconf_addr_solict_mult(target, &mcaddr);
ndisc_send_ns(rt->dst.dev, NULL, target, &mcaddr, NULL);
} else {
read_unlock_bh(&neigh->lock);
write_unlock_bh(&neigh->lock);
}
}
#else
Expand Down

0 comments on commit 7ff74a5

Please sign in to comment.