diff options
| author | David Ahern | 2019-05-08 05:44:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-05-16 19:41:29 +0200 |
| commit | da2e770f0c4adb6fd58663e94fa1e4a57b0ad8dc (patch) | |
| tree | 2dea56e96e54caa7cfa58c077723e7d9c8708c84 /net/ipv4 | |
| parent | fib_rules: return 0 directly if an exactly same rule exists when NLM_F_EXCL n... (diff) | |
| download | kernel-qcow2-linux-da2e770f0c4adb6fd58663e94fa1e4a57b0ad8dc.tar.gz kernel-qcow2-linux-da2e770f0c4adb6fd58663e94fa1e4a57b0ad8dc.tar.xz kernel-qcow2-linux-da2e770f0c4adb6fd58663e94fa1e4a57b0ad8dc.zip | |
ipv4: Fix raw socket lookup for local traffic
[ Upstream commit 19e4e768064a87b073a4b4c138b55db70e0cfb9f ]
inet_iif should be used for the raw socket lookup. inet_iif considers
rt_iif which handles the case of local traffic.
As it stands, ping to a local address with the '-I <dev>' option fails
ever since ping was changed to use SO_BINDTODEVICE instead of
cmsg + IP_PKTINFO.
IPv6 works fine.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/raw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 33df4d76db2d..711a5c75bd4b 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -174,6 +174,7 @@ static int icmp_filter(const struct sock *sk, const struct sk_buff *skb) static int raw_v4_input(struct sk_buff *skb, const struct iphdr *iph, int hash) { int sdif = inet_sdif(skb); + int dif = inet_iif(skb); struct sock *sk; struct hlist_head *head; int delivered = 0; @@ -186,8 +187,7 @@ static int raw_v4_input(struct sk_buff *skb, const struct iphdr *iph, int hash) net = dev_net(skb->dev); sk = __raw_v4_lookup(net, __sk_head(head), iph->protocol, - iph->saddr, iph->daddr, - skb->dev->ifindex, sdif); + iph->saddr, iph->daddr, dif, sdif); while (sk) { delivered = 1; |