]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
xfrm: update flowi saddr in icmp_send if unset
authorUlrich Weber <uweber@astaro.com>
Fri, 5 Nov 2010 01:39:12 +0000 (01:39 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Nov 2010 19:43:39 +0000 (11:43 -0800)
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>
net/ipv4/icmp.c

index 96bc7f9475a3f2f0124685cc1b7afb7b58c23d8d..e5d1a44bcbdf04b851d441ea5ebd8fbe44514704 100644 (file)
@@ -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: