aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGao feng <omarapazanadi@gmail.com>2011-10-28 02:46:57 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-11 09:43:39 -0800
commit7d1be381b53d55d3a0ff0565922d29420985a3fe (patch)
tree261d01227f644d8e875b9f26976c8dbecf31eb10
parent9dcc771f0944de26f5ad73edffe7f9c4985e3f6c (diff)
downloadlinux-linaro-precise-7d1be381b53d55d3a0ff0565922d29420985a3fe.tar.gz
ipv6: fix route error binding peer in func icmp6_dst_alloc
[ Upstream commit 7011687f0f2f12cc348f6a693fafe63d89167eac ] in func icmp6_dst_alloc,dst_metric_set call ipv6_cow_metrics to set metric. ipv6_cow_metrics may will call rt6_bind_peer to set rt6_info->rt6i_peer. So,we should move ipv6_addr_copy before dst_metric_set to make sure rt6_bind_peer success. Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--net/ipv6/route.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index fb545edef6e..57b82dc1ae9 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1086,11 +1086,10 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
rt->dst.output = ip6_output;
dst_set_neighbour(&rt->dst, neigh);
atomic_set(&rt->dst.__refcnt, 1);
- dst_metric_set(&rt->dst, RTAX_HOPLIMIT, 255);
-
ipv6_addr_copy(&rt->rt6i_dst.addr, addr);
rt->rt6i_dst.plen = 128;
rt->rt6i_idev = idev;
+ dst_metric_set(&rt->dst, RTAX_HOPLIMIT, 255);
spin_lock_bh(&icmp6_dst_lock);
rt->dst.next = icmp6_dst_gc_list;