aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>2013-01-17 07:53:55 -0500
committerDavid S. Miller <davem@davemloft.net>2013-01-17 18:38:19 -0500
commit707be1ff3d9309f810e33790e6ae3f15e7ac967e (patch)
tree5a806574dfa38cdbe48cfff6bd549ac02c50d614
parent9bb5a14813f502b867a45075c88bc1f2b78381df (diff)
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>
-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,
913 * dst entry of the nexthop router 913 * dst entry of the nexthop router
914 */ 914 */
915 rt = (struct rt6_info *) *dst; 915 rt = (struct rt6_info *) *dst;
916 n = rt->n; 916 rcu_read_lock_bh();
917 if (n && !(n->nud_state & NUD_VALID)) { 917 n = __ipv6_neigh_lookup_noref(rt->dst.dev, rt6_nexthop(rt, &fl6->daddr));
918 err = n && !(n->nud_state & NUD_VALID) ? -EINVAL : 0;
919 rcu_read_unlock_bh();
920
921 if (err) {
918 struct inet6_ifaddr *ifp; 922 struct inet6_ifaddr *ifp;
919 struct flowi6 fl_gw6; 923 struct flowi6 fl_gw6;
920 int redirect; 924 int redirect;