From: Greg Kroah-Hartman Date: Sat, 7 Jun 2025 10:01:20 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v6.12.33~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9af14f366e86893f24d6c8e7c021b6d953332c2c;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: netfilter-nft_socket-fix-sk-refcount-leaks.patch --- diff --git a/queue-5.10/netfilter-nft_socket-fix-sk-refcount-leaks.patch b/queue-5.10/netfilter-nft_socket-fix-sk-refcount-leaks.patch new file mode 100644 index 0000000000..6f9343bdf2 --- /dev/null +++ b/queue-5.10/netfilter-nft_socket-fix-sk-refcount-leaks.patch @@ -0,0 +1,45 @@ +From 8b26ff7af8c32cb4148b3e147c52f9e4c695209c Mon Sep 17 00:00:00 2001 +From: Florian Westphal +Date: Thu, 5 Sep 2024 12:54:46 +0200 +Subject: netfilter: nft_socket: fix sk refcount leaks + +From: Florian Westphal + +commit 8b26ff7af8c32cb4148b3e147c52f9e4c695209c upstream. + +We must put 'sk' reference before returning. + +Fixes: 039b1f4f24ec ("netfilter: nft_socket: fix erroneous socket assignment") +Signed-off-by: Florian Westphal +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Greg Kroah-Hartman +--- + net/netfilter/nft_socket.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/net/netfilter/nft_socket.c ++++ b/net/netfilter/nft_socket.c +@@ -88,13 +88,13 @@ static void nft_socket_eval(const struct + *dest = sk->sk_mark; + } else { + regs->verdict.code = NFT_BREAK; +- return; ++ goto out_put_sk; + } + break; + case NFT_SOCKET_WILDCARD: + if (!sk_fullsock(sk)) { + regs->verdict.code = NFT_BREAK; +- return; ++ goto out_put_sk; + } + nft_socket_wildcard(pkt, regs, sk, dest); + break; +@@ -103,6 +103,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.10/series b/queue-5.10/series index 5e4526ccba..7df308eb22 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -6,3 +6,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