ipv4: Fix raw socket lookup for local traffic
Subsystems (2)
PATCH 1/1 ipv4: Fix raw socket lookup for local traffic
From: David Ahern <[email protected]>
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.
--- net/ipv4/raw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv4/raw.c +2 -2
@@ -173,6 +173,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 ;
@@ -185,8 +186,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 ;
Signature · 1 line
2.11.0
David Miller
maintainerFrom: David Ahern <[email protected]>
Date: Tue, 7 May 2019 20:44:59 -0700
Quoted 5 lines
From: David Ahern <[email protected]>
inet_iifshould be used for the raw socket lookup.inet_iifconsidersrt_iifwhich handles the case of local traffic.
Quoted 8 lines
As it stands, ping to a local address with the '-I <dev>' option fails ever since ping was changed to use
SO_BINDTODEVICEinstead of cmsg +IP_PKTINFO.IPv6 works fine.
Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")Signed-off-by David Ahern <[email protected]>
Applied and queued up for -stable, thanks David.