aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorUlrich Weber <uweber@astaro.com>2010-11-05 01:39:12 +0000
committerDavid S. Miller <davem@davemloft.net>2010-11-16 11:43:39 -0800
commit7d98ffd8c2d1da6cec5d84eba42c4aa836a93f85 (patch)
tree398437e234367d8184bbaed1b3af8dc8ed7d5d3a /net
parent4c62ab9c538bc09c38093fa079e6902ea4d42b98 (diff)
downloadmrst-s0i3-test-7d98ffd8c2d1da6cec5d84eba42c4aa836a93f85.tar.gz
mrst-s0i3-test-7d98ffd8c2d1da6cec5d84eba42c4aa836a93f85.tar.xz
mrst-s0i3-test-7d98ffd8c2d1da6cec5d84eba42c4aa836a93f85.zip
xfrm: update flowi saddr in icmp_send if unset
otherwise xfrm_lookup will fail to find correct policy Signed-off-by: Ulrich Weber <uweber@astaro.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/icmp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 96bc7f9475a..e5d1a44bcbd 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -569,6 +569,9 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
/* No need to clone since we're just using its address. */
rt2 = rt;
+ if (!fl.nl_u.ip4_u.saddr)
+ fl.nl_u.ip4_u.saddr = rt->rt_src;
+
err = xfrm_lookup(net, (struct dst_entry **)&rt, &fl, NULL, 0);
switch (err) {
case 0: