]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ipv4: Fix wrong order of ip_rt_get_source() and update iph->daddr.
authorLi Wei <lw@cn.fujitsu.com>
Thu, 9 Feb 2012 21:15:25 +0000 (21:15 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Feb 2012 20:12:12 +0000 (15:12 -0500)
This patch fix a bug which introduced by commit ac8a4810 (ipv4: Save
nexthop address of LSRR/SSRR option to IPCB.).In that patch, we saved
the nexthop of SRR in ip_option->nexthop and update iph->daddr until
we get to ip_forward_options(), but we need to update it before
ip_rt_get_source(), otherwise we may get a wrong src.

Signed-off-by: Li Wei <lw@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_options.c

index 1e60f7679075b660f489bcd1a9f462c832c5e77e..42dd1a90edea0916379f41d9722d5b574f7b69e2 100644 (file)
@@ -573,8 +573,8 @@ void ip_forward_options(struct sk_buff *skb)
                }
                if (srrptr + 3 <= srrspace) {
                        opt->is_changed = 1;
-                       ip_rt_get_source(&optptr[srrptr-1], skb, rt);
                        ip_hdr(skb)->daddr = opt->nexthop;
+                       ip_rt_get_source(&optptr[srrptr-1], skb, rt);
                        optptr[2] = srrptr+4;
                } else if (net_ratelimit())
                        printk(KERN_CRIT "ip_forward(): Argh! Destination lost!\n");