OSDN Git Service

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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Mar 2012 00:34:03 +0000 (16:34 -0800)
commitab2fd30a38e23f0b6f2e331889b31f4f6fb2378a
tree00f60907a997d128147f79cb88333bcba4b73ea8
parent5805d4729059f578c8283ccc44021342fbe8c93d
ipv4: Fix wrong order of ip_rt_get_source() and update iph->daddr.

[ Upstream commit 5dc7883f2a7c25f8df40d7479687153558cd531b ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ipv4/ip_options.c