Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: nf_ct_ipv6: use ipv6_iface_scope_id in conntrack to return scope id

As in (842df07 ipv6: use newly introduced __ipv6_addr_needs_scope_id and
ipv6_iface_scope_id).

Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

Hannes Frederic Sowa and committed by
Pablo Neira Ayuso
d00bd3d4 5eb358d0

+2 -6
+2 -6
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
··· 330 330 sizeof(sin6.sin6_addr)); 331 331 332 332 nf_ct_put(ct); 333 - 334 - if (ipv6_addr_type(&sin6.sin6_addr) & IPV6_ADDR_LINKLOCAL) 335 - sin6.sin6_scope_id = sk->sk_bound_dev_if; 336 - else 337 - sin6.sin6_scope_id = 0; 338 - 333 + sin6.sin6_scope_id = ipv6_iface_scope_id(&sin6.sin6_addr, 334 + sk->sk_bound_dev_if); 339 335 return copy_to_user(user, &sin6, sizeof(sin6)) ? -EFAULT : 0; 340 336 } 341 337