OSDN Git Service

netfilter: socket: icmp6: fix use-after-scope
authorBenjamin Hesmans <benjamin.hesmans@tessares.net>
Fri, 3 Sep 2021 13:23:35 +0000 (15:23 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 3 Sep 2021 16:25:31 +0000 (18:25 +0200)
commit730affed24bffcd1eebd5903171960f5ff9f1f22
tree058c69fd129cb1588773c62a58a4d4e2e60f9974
parentd7e7747ac5c2496c98291944c6066adaa9f3b975
netfilter: socket: icmp6: fix use-after-scope

Bug reported by KASAN:

BUG: KASAN: use-after-scope in inet6_ehashfn (net/ipv6/inet6_hashtables.c:40)
Call Trace:
(...)
inet6_ehashfn (net/ipv6/inet6_hashtables.c:40)
(...)
nf_sk_lookup_slow_v6 (net/ipv6/netfilter/nf_socket_ipv6.c:91
net/ipv6/netfilter/nf_socket_ipv6.c:146)

It seems that this bug has already been fixed by Eric Dumazet in the
past in:
commit 78296c97ca1f ("netfilter: xt_socket: fix a stack corruption bug")

But a variant of the same issue has been introduced in
commit d64d80a2cde9 ("netfilter: x_tables: don't extract flow keys on early demuxed sks in socket match")

`daddr` and `saddr` potentially hold a reference to ipv6_var that is no
longer in scope when the call to `nf_socket_get_sock_v6` is made.

Fixes: d64d80a2cde9 ("netfilter: x_tables: don't extract flow keys on early demuxed sks in socket match")
Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Benjamin Hesmans <benjamin.hesmans@tessares.net>
Reviewed-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/ipv6/netfilter/nf_socket_ipv6.c