1 files changed, 6 insertions, 1 deletions

diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
index 02dcafdc7a95..e5f6cf7e0d8c 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;
 }