From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 7 Jun 2025 10:01:11 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v6.12.33~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e503dab406d2546e9bd659558e7cc55c0cd293ec;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	netfilter-nft_socket-fix-sk-refcount-leaks.patch
---

diff --git a/queue-5.4/netfilter-nft_socket-fix-sk-refcount-leaks.patch b/queue-5.4/netfilter-nft_socket-fix-sk-refcount-leaks.patch
new file mode 100644
index 0000000000..026003af4d
--- /dev/null
+++ b/queue-5.4/netfilter-nft_socket-fix-sk-refcount-leaks.patch
@@ -0,0 +1,38 @@
+From 8b26ff7af8c32cb4148b3e147c52f9e4c695209c Mon Sep 17 00:00:00 2001
+From: Florian Westphal <fw@strlen.de>
+Date: Thu, 5 Sep 2024 12:54:46 +0200
+Subject: netfilter: nft_socket: fix sk refcount leaks
+
+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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/netfilter/nft_socket.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/net/netfilter/nft_socket.c
++++ b/net/netfilter/nft_socket.c
+@@ -69,7 +69,7 @@ static void nft_socket_eval(const struct
+ 			*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
+ 		regs->verdict.code = NFT_BREAK;
+ 	}
+ 
++out_put_sk:
+ 	if (sk != skb->sk)
+ 		sock_gen_put(sk);
+ }
diff --git a/queue-5.4/series b/queue-5.4/series
index 6443f90166..c9c83e3014 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -5,3 +5,4 @@ usb-quirks-add-no_lpm-quirk-for-sandisk-extreme-55ae.patch
 usb-storage-ignore-uas-driver-for-sandisk-3.2-gen2-storage-device.patch
 usb-usbtmc-fix-timeout-value-in-get_stb.patch
 thunderbolt-do-not-double-dequeue-a-configuration-request.patch
+netfilter-nft_socket-fix-sk-refcount-leaks.patch