Commit 145a3621 authored by YOSHIFUJI Hideaki / 吉藤英明's avatar YOSHIFUJI Hideaki / 吉藤英明 Committed by David S. Miller
Browse files

ipv6: Do not depend on rt->n in rt6_check_neigh().



CC: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c440f160
...@@ -546,20 +546,24 @@ static inline bool rt6_check_neigh(struct rt6_info *rt) ...@@ -546,20 +546,24 @@ static inline bool rt6_check_neigh(struct rt6_info *rt)
struct neighbour *neigh; struct neighbour *neigh;
bool ret = false; bool ret = false;
neigh = rt->n;
if (rt->rt6i_flags & RTF_NONEXTHOP || if (rt->rt6i_flags & RTF_NONEXTHOP ||
!(rt->rt6i_flags & RTF_GATEWAY)) !(rt->rt6i_flags & RTF_GATEWAY))
ret = true; return true;
else if (neigh) {
read_lock_bh(&neigh->lock); rcu_read_lock_bh();
neigh = __ipv6_neigh_lookup_noref(rt->dst.dev, &rt->rt6i_gateway);
if (neigh) {
read_lock(&neigh->lock);
if (neigh->nud_state & NUD_VALID) if (neigh->nud_state & NUD_VALID)
ret = true; ret = true;
#ifdef CONFIG_IPV6_ROUTER_PREF #ifdef CONFIG_IPV6_ROUTER_PREF
else if (!(neigh->nud_state & NUD_FAILED)) else if (!(neigh->nud_state & NUD_FAILED))
ret = true; ret = true;
#endif #endif
read_unlock_bh(&neigh->lock); read_unlock(&neigh->lock);
} }
rcu_read_unlock_bh();
return ret; return ret;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment