From: Florian Westphal fw@strlen.de

stable inclusion from stable-v5.10.203 commit bf72b44fe81be08a9fcd58aabf417cd3337ffc99 category: bugfix bugzilla: 189434 CVE: CVE-2023-6817

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=...

--------------------------------

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 Conflicts: net/netfilter/nft_set_pipapo.c Signed-off-by: Dong Chenchen dongchenchen2@huawei.com --- net/netfilter/nft_set_pipapo.c | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c index 3be93175b3ff..08fc65ca31d4 100644 --- a/net/netfilter/nft_set_pipapo.c +++ b/net/netfilter/nft_set_pipapo.c @@ -1984,6 +1984,9 @@ static void nft_pipapo_walk(const struct nft_ctx *ctx, struct nft_set *set, if (nft_set_elem_expired(&e->ext)) goto cont;

+ if (!nft_set_elem_active(&e->ext, iter->genmask)) + goto cont; + elem.priv = e;

iter->err = iter->fn(ctx, set, iter, &elem);