ipv4: Fix raw socket lookup for local traffic (19e4e768) · Commits · 戴 / test

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: ("Linux-2.6.12-rc2") Signed-off-by:

David Ahern <dsahern@gmail.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/ipv4/raw.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

Admin message