diff options
| author | Fernando Fernandez Mancera <ffmancera@riseup.net> | 2019-09-01 11:48:08 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-01 09:01:45 +0200 |
| commit | f63432cd1bb224f61216e4a4726ff29ddffbed98 (patch) | |
| tree | 3434ffd45e39aa2fed37b35a8e3b1102e5605514 /net | |
| parent | a2a3638f3e6f5d3fde5affae04fc6a540cdc9319 (diff) | |
| download | linux-stable-f63432cd1bb224f61216e4a4726ff29ddffbed98.tar.gz linux-stable-f63432cd1bb224f61216e4a4726ff29ddffbed98.tar.bz2 linux-stable-f63432cd1bb224f61216e4a4726ff29ddffbed98.zip | |
netfilter: nft_socket: fix erroneous socket assignment
[ Upstream commit 039b1f4f24ecc8493b6bb9d70b4b78750d1b35c2 ]
The socket assignment is wrong, see skb_orphan():
When skb->destructor callback is not set, but skb->sk is set, this hits BUG().
Link: https://bugzilla.redhat.com/show_bug.cgi?id=1651813
Fixes: 554ced0a6e29 ("netfilter: nf_tables: add support for native socket matching")
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/nft_socket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/nft_socket.c b/net/netfilter/nft_socket.c index d7f3776dfd71..637ce3e8c575 100644 --- a/net/netfilter/nft_socket.c +++ b/net/netfilter/nft_socket.c @@ -47,9 +47,6 @@ static void nft_socket_eval(const struct nft_expr *expr, return; } - /* So that subsequent socket matching not to require other lookups. */ - skb->sk = sk; - switch(priv->key) { case NFT_SOCKET_TRANSPARENT: nft_reg_store8(dest, inet_sk_transparent(sk)); @@ -66,6 +63,9 @@ static void nft_socket_eval(const struct nft_expr *expr, WARN_ON(1); regs->verdict.code = NFT_BREAK; } + + if (sk != skb->sk) + sock_gen_put(sk); } static const struct nla_policy nft_socket_policy[NFTA_SOCKET_MAX + 1] = { |