| Submitter | Li Wei |
|---|---|
| Date | Feb. 10, 2012, 7:15 a.m. |
| Message ID | <4F34C40D.5010503@cn.fujitsu.com> |
| Download | mbox | patch |
| Permalink | /patch/140513/ |
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Comments
From: Li Wei <lw@cn.fujitsu.com> Date: Fri, 10 Feb 2012 15:15:25 +0800 > 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> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Patch
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index 1e60f76..42dd1a9 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c @@ -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");
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> --- net/ipv4/ip_options.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html