Commit 0f3ff128 authored by David Ahern's avatar David Ahern Committed by Xponential31
Browse files

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: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 50177d2b

net/ipv4/raw.c

+2 −2
Original line number Diff line number Diff line
@@ -158,6 +158,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 dif = inet_iif(skb);

	struct sock *sk;

	struct hlist_head *head;

	int delivered = 0;
@@ -170,8 +171,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);

			     iph->saddr, iph->daddr, dif);



	while (sk) {

		delivered = 1;