lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Florian Westphal
2012-11-13 00:17:24 +00:00
committed by Pablo Neira Ayuso
parent 121d1e0941
commit d3976a53ce
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
View File

@@ -334,9 +334,14 @@ ipv6_getorigdst(struct sock *sk, int optval, void __user *user, int *len)
memcpy(&sin6.sin6_addr, memcpy(&sin6.sin6_addr,
&ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.in6, &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.in6,
sizeof(sin6.sin6_addr)); sizeof(sin6.sin6_addr));
sin6.sin6_scope_id = sk->sk_bound_dev_if;
nf_ct_put(ct); 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; return copy_to_user(user, &sin6, sizeof(sin6)) ? -EFAULT : 0;
} }