Commit d3976a53 authored Nov 13, 2012 by Florian Westphal Committed by Pablo Neira Ayuso Nov 13, 2012

netfilter: ipv6: only provide sk_bound_dev_if for link-local addr



yoshfuji points out that sk_bound_dev_if should only be provided
for link-local addresses.

IPv6 getpeer/sockname also has this test, i.e. we will now
only set sin6_scope_id if the original(!) destination
was a link-local address.

Reported-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent 121d1e09

net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -334,9 +334,14 @@ ipv6_getorigdst(struct sock sk, int optval, void __user user, int *len)
		memcpy(&sin6.sin6_addr,
		&ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.in6,
		sizeof(sin6.sin6_addr));
		sin6.sin6_scope_id = sk->sk_bound_dev_if;

		nf_ct_put(ct);

		if (ipv6_addr_type(&sin6.sin6_addr) & IPV6_ADDR_LINKLOCAL)
		sin6.sin6_scope_id = sk->sk_bound_dev_if;
		else
		sin6.sin6_scope_id = 0;

		return copy_to_user(user, &sin6, sizeof(sin6)) ? -EFAULT : 0;
		}