Hi Greg, Sasha,
This batch contains backported fixes for 6.1 -stable.
The following list shows the backported patch, I am using original commit IDs for reference:
1) 039b1f4f24ec ("netfilter: nft_socket: fix erroneous socket assignment")
this is to fix a sk memleak.
Please, apply, Thanks.
Florian Westphal (1): netfilter: nft_socket: fix sk refcount leaks
net/netfilter/nft_socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
From: Florian Westphal fw@strlen.de
commit 8b26ff7af8c32cb4148b3e147c52f9e4c695209c upstream.
We must put 'sk' reference before returning.
Fixes: 039b1f4f24ec ("netfilter: nft_socket: fix erroneous socket assignment") Signed-off-by: Florian Westphal fw@strlen.de Signed-off-by: Pablo Neira Ayuso pablo@netfilter.org --- net/netfilter/nft_socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/netfilter/nft_socket.c b/net/netfilter/nft_socket.c index c7b78e4ef459..46d11f943795 100644 --- a/net/netfilter/nft_socket.c +++ b/net/netfilter/nft_socket.c @@ -69,7 +69,7 @@ static void nft_socket_eval(const struct nft_expr *expr, *dest = sk->sk_mark; } else { regs->verdict.code = NFT_BREAK; - return; + goto out_put_sk; } break; default: @@ -77,6 +77,7 @@ static void nft_socket_eval(const struct nft_expr *expr, regs->verdict.code = NFT_BREAK; }
+out_put_sk: if (sk != skb->sk) sock_gen_put(sk); }
On Thu, Jun 05, 2025 at 01:28:16AM +0200, Pablo Neira Ayuso wrote:
Hi Greg, Sasha,
This batch contains backported fixes for 6.1 -stable.
The following list shows the backported patch, I am using original commit IDs for reference:
- 039b1f4f24ec ("netfilter: nft_socket: fix erroneous socket assignment")
Apologies, original commit actually is:
8b26ff7af8c3 ("netfilter: nft_socket: fix sk refcount leaks")
this is to fix a sk memleak.
Please, apply, Thanks.
Florian Westphal (1): netfilter: nft_socket: fix sk refcount leaks
net/netfilter/nft_socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
-- 2.30.2
linux-stable-mirror@lists.linaro.org
-
Pablo Neira Ayuso