summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>2013-01-17 12:53:55 +0000
committerDavid S. Miller <davem@davemloft.net>2013-01-17 18:38:19 -0500
commit707be1ff3d9309f810e33790e6ae3f15e7ac967e (patch)
tree5a806574dfa38cdbe48cfff6bd549ac02c50d614 /net
parent9bb5a14813f502b867a45075c88bc1f2b78381df (diff)
downloadlinux-707be1ff3d9309f810e33790e6ae3f15e7ac967e.tar.gz
linux-707be1ff3d9309f810e33790e6ae3f15e7ac967e.tar.bz2
linux-707be1ff3d9309f810e33790e6ae3f15e7ac967e.zip
ipv6: Do not depend on rt->n in ip6_dst_lookup_tail().
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/ip6_output.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 9250c696de9d..7c00edb343a0 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -913,8 +913,12 @@ static int ip6_dst_lookup_tail(struct sock *sk,
* dst entry of the nexthop router
*/
rt = (struct rt6_info *) *dst;
- n = rt->n;
- if (n && !(n->nud_state & NUD_VALID)) {
+ rcu_read_lock_bh();
+ n = __ipv6_neigh_lookup_noref(rt->dst.dev, rt6_nexthop(rt, &fl6->daddr));
+ err = n && !(n->nud_state & NUD_VALID) ? -EINVAL : 0;
+ rcu_read_unlock_bh();
+
+ if (err) {
struct inet6_ifaddr *ifp;
struct flowi6 fl_gw6;
int redirect;