diff options
| author | David Miller <davem@davemloft.net> | 2007-06-06 22:38:11 -0700 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2007-06-11 11:36:51 -0700 |
| commit | 572ea9d51b3c264877522e1e3bc585be24cf5938 (patch) | |
| tree | b4f490bd32ae35a8bbb5ec75ccec7a08714a0e84 | |
| parent | 0b4e7af9ed68fca1a19fdc3181bf077679d4ef22 (diff) | |
| download | linux-stable-572ea9d51b3c264877522e1e3bc585be24cf5938.tar.gz linux-stable-572ea9d51b3c264877522e1e3bc585be24cf5938.tar.bz2 linux-stable-572ea9d51b3c264877522e1e3bc585be24cf5938.zip | |
[PATCH] ICMP: Fix icmp_errors_use_inbound_ifaddr sysctl
Currently when icmp_errors_use_inbound_ifaddr is set and an ICMP error is
sent after the packet passed through ip_output(), an address from the
outgoing interface is chosen as ICMP source address since skb->dev doesn't
point to the incoming interface anymore.
Fix this by doing an interface lookup on rt->dst.iif and using that device.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | net/ipv4/icmp.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 4b7a0d946a0d..03d9659c1791 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -513,9 +513,15 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) saddr = iph->daddr; if (!(rt->rt_flags & RTCF_LOCAL)) { - if (sysctl_icmp_errors_use_inbound_ifaddr) - saddr = inet_select_addr(skb_in->dev, 0, RT_SCOPE_LINK); - else + struct net_device *dev = NULL; + + if (rt->fl.iif && sysctl_icmp_errors_use_inbound_ifaddr) + dev = dev_get_by_index(rt->fl.iif); + + if (dev) { + saddr = inet_select_addr(dev, 0, RT_SCOPE_LINK); + dev_put(dev); + } else saddr = 0; } |