Messages in this thread Patch in this message | | | Date | Mon, 27 Feb 2012 17:02:27 -0800 | From | Greg KH <> | Subject | [ 24/73] ipv4: fix for ip_options_rcv_srr() daddr update. |
| |
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Wei <lw@cn.fujitsu.com>
[ Upstream commit b12f62efb8ec0b9523bdb6c2d412c07193086de9 ]
When opt->srr_is_hit is set skb_rtable(skb) has been updated for 'nexthop' and iph->daddr should always equals to skb_rtable->rt_dst holds, We need update iph->daddr either.
Signed-off-by: Li Wei <lw@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- net/ipv4/ip_options.c | 1 + 1 file changed, 1 insertion(+)
--- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c @@ -640,6 +640,7 @@ int ip_options_rcv_srr(struct sk_buff *s } if (srrptr <= srrspace) { opt->srr_is_hit = 1; + iph->daddr = nexthop; opt->is_changed = 1; } return 0;
| |