Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69348094 authored by Fernando Fernandez Mancera's avatar Fernando Fernandez Mancera Committed by Greg Kroah-Hartman
Browse files

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: 554ced0a ("netfilter: nf_tables: add support for native socket matching")
Signed-off-by: default avatarFernando Fernandez Mancera <ffmancera@riseup.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 649836fe

net/netfilter/nft_socket.c

+3 −3
Original line number Diff line number Diff line
@@ -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] = {