Patchwork [1/1] netfilter: ipv6: only provide sk_bound_dev_if for link-local addr

login
register
mail settings
Submitter Florian Westphal
Date Nov. 13, 2012, 10:17 a.m.
Message ID <1352801844-23852-1-git-send-email-fw@strlen.de>
Download mbox | patch
Permalink /patch/198596/
State Accepted
Headers show

Comments

Florian Westphal - Nov. 13, 2012, 10:17 a.m.
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>
---
 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
Pablo Neira - Nov. 14, 2012, 5:56 p.m.
On Tue, Nov 13, 2012 at 11:17:24AM +0100, Florian Westphal wrote:
> 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.

Applied, thanks Florian.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
index 02dcafd..e5f6cf7 100644
--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
@@ -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;
 }