| From 7b8bc677efd2ce23df95a277f4f95d909aec310e Mon Sep 17 00:00:00 2001 |
| From: Gao feng <omarapazanadi@gmail.com> |
| Date: Fri, 28 Oct 2011 02:46:57 +0000 |
| Subject: ipv6: fix route error binding peer in func icmp6_dst_alloc |
| |
| |
| From: Gao feng <omarapazanadi@gmail.com> |
| |
| [ 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> |
| --- |
| net/ipv6/route.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/net/ipv6/route.c |
| +++ b/net/ipv6/route.c |
| @@ -1086,11 +1086,10 @@ struct dst_entry *icmp6_dst_alloc(struct |
| 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; |
