6.1-stable patches

added patches:
	netfilter-nft_set_pipapo-skip-inactive-elements-during-set-walk.patch

diff --git a/queue-6.1/netfilter-nft_set_pipapo-skip-inactive-elements-during-set-walk.patch b/queue-6.1/netfilter-nft_set_pipapo-skip-inactive-elements-during-set-walk.patch
new file mode 100644 (file)
index 0000000..54e5365
--- /dev/null
+++ b/queue-6.1/netfilter-nft_set_pipapo-skip-inactive-elements-during-set-walk.patch
@@ -0,0 +1,32 @@
+From 317eb9685095678f2c9f5a8189de698c5354316a Mon Sep 17 00:00:00 2001
+From: Florian Westphal <fw@strlen.de>
+Date: Fri, 1 Dec 2023 15:47:13 +0100
+Subject: netfilter: nft_set_pipapo: skip inactive elements during set walk
+
+From: Florian Westphal <fw@strlen.de>
+
+commit 317eb9685095678f2c9f5a8189de698c5354316a upstream.
+
+Otherwise set elements can be deactivated twice which will cause a crash.
+
+Reported-by: Xingyuan Mo <hdthky0@gmail.com>
+Fixes: 3c4287f62044 ("nf_tables: Add set type for arbitrary concatenation of ranges")
+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_set_pipapo.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/net/netfilter/nft_set_pipapo.c
++++ b/net/netfilter/nft_set_pipapo.c
+@@ -2042,6 +2042,9 @@ static void nft_pipapo_walk(const struct
+ 
+               e = f->mt[r].e;
+ 
++              if (!nft_set_elem_active(&e->ext, iter->genmask))
++                      goto cont;
++
+               elem.priv = e;
+ 
+               iter->err = iter->fn(ctx, set, iter, &elem);

diff --git a/queue-6.1/series b/queue-6.1/series
index cd0ee8f20b1bc839b4fe833360eba17fd87df0fc..c4569bd24f1abd763820122f14862f132b6a38e0 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -186,3 +186,4 @@ kvm-svm-update-efer-software-model-on-cr0-trap-for-sev-es.patch
 mips-loongson64-reserve-vgabios-memory-on-boot.patch
 mips-loongson64-handle-more-memory-types-passed-from-firmware.patch
 mips-loongson64-enable-dma-noncoherent-support.patch
+netfilter-nft_set_pipapo-skip-inactive-elements-during-set-walk.patch