leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ndisc: Update neigh->updated with write lock.

Browse Source 
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>
This commit is contained in:
YOSHIFUJI Hideaki / 吉藤英明 2013-01-17 12:53:02 +00:00 committed by David S. Miller
parent cbf1de7232
commit 7ff74a596b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/ipv6/route.c
View File

@ -499,22 +499,26 @@ static void rt6_probe(struct rt6_info *rt)
* to no more than one per minute. * to no more than one per minute.
*/ */
neigh = rt ? rt->n : NULL; neigh = rt ? rt->n : NULL;
if (!neigh || (neigh->nud_state & NUD_VALID)) if (!neigh)
return; return;
read_lock_bh(&neigh->lock); write_lock_bh(&neigh->lock);
if (neigh->nud_state & NUD_VALID) {
write_unlock_bh(&neigh->lock);
return;
}
if (!(neigh->nud_state & NUD_VALID) && if (!(neigh->nud_state & NUD_VALID) &&
time_after(jiffies, neigh->updated + rt->rt6i_idev->cnf.rtr_probe_interval)) { time_after(jiffies, neigh->updated + rt->rt6i_idev->cnf.rtr_probe_interval)) {
struct in6_addr mcaddr; struct in6_addr mcaddr;
struct in6_addr *target; struct in6_addr *target;
neigh->updated = jiffies; neigh->updated = jiffies;
read_unlock_bh(&neigh->lock); write_unlock_bh(&neigh->lock);
target = (struct in6_addr *)&neigh->primary_key; target = (struct in6_addr *)&neigh->primary_key;
addrconf_addr_solict_mult(target, &mcaddr); addrconf_addr_solict_mult(target, &mcaddr);
ndisc_send_ns(rt->dst.dev, NULL, target, &mcaddr, NULL); ndisc_send_ns(rt->dst.dev, NULL, target, &mcaddr, NULL);
} else { } else {
read_unlock_bh(&neigh->lock); write_unlock_bh(&neigh->lock);
} }
} }
#else #else