[IPV6]: Repair Incoming Interface Handling for Raw Socket. (2dac4b96) · Commits · 戴 / test

Due to changes to enforce checking interface bindings, sockets did not see loopback packets bound for our local address on our interface. e.g.) When we ping6 fe80::1%eth0, skb->dev points loopback_dev while IP6CB(skb)->iif indicates eth0. This patch fixes the issue by using appropriate incoming interface, in the sense of scoping architecture. Signed-off-by:

YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/ipv6/icmp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -549,7 +549,7 @@ static void icmpv6_notify(struct sk_buff *skb, int type, int code, u32 info)
		read_lock(&raw_v6_lock);
		if ((sk = sk_head(&raw_v6_htable[hash])) != NULL) {
		while((sk = __raw_v6_lookup(sk, nexthdr, daddr, saddr,
		skb->dev->ifindex))) {
		IP6CB(skb)->iif))) {
		rawv6_err(sk, skb, NULL, type, code, inner_offset, info);
		sk = sk_next(sk);
		}

net/ipv6/raw.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -166,7 +166,7 @@ int ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)
		if (sk == NULL)
		goto out;

		sk = __raw_v6_lookup(sk, nexthdr, daddr, saddr, skb->dev->ifindex);
		sk = __raw_v6_lookup(sk, nexthdr, daddr, saddr, IP6CB(skb)->iif);

		while (sk) {
		delivered = 1;
		@@ -178,7 +178,7 @@ int ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)
		rawv6_rcv(sk, clone);
		}
		sk = __raw_v6_lookup(sk_next(sk), nexthdr, daddr, saddr,
		skb->dev->ifindex);
		IP6CB(skb)->iif);
		}
		out:
		read_unlock(&raw_v6_lock);

Admin message