Messages in this thread Patch in this message | | | Date | Fri, 08 Jun 2007 00:15:30 -0700 | From | Chris Wright <> | Subject | [patch 19/32] ICMP: Fix icmp_errors_use_inbound_ifaddr sysctl |
| |
-stable review patch. If anyone has any objections, please let us know. ---------------------
From: David Miller <davem@davemloft.net>
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>
--- net/ipv4/icmp.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
--- linux-2.6.20.13.orig/net/ipv4/icmp.c +++ linux-2.6.20.13/net/ipv4/icmp.c @@ -513,9 +513,15 @@ void icmp_send(struct sk_buff *skb_in, i 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; } -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |