From: Florian Westphal <fw@strlen.de>
Date: Thu, 11 Aug 2022 11:30:39 +0000 (+0200)
Subject: netfilter: nf_tables: fix scheduling-while-atomic splat
X-Git-Tag: v5.19.4~166
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4fbfbccc0a957b78768f1925f28df81185d395e;p=thirdparty%2Fkernel%2Fstable.git

netfilter: nf_tables: fix scheduling-while-atomic splat

commit 2024439bd5ceb145eeeb428b2a59e9b905153ac3 upstream.

nf_tables_check_loops() can be called from rhashtable list
walk so cond_resched() cannot be used here.

Fixes: 81ea01066741 ("netfilter: nf_tables: add rescheduling points during loop detection walks")
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>
---

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 74390176a389f..383d196cb93fc 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -9372,13 +9372,9 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx,
 				break;
 			}
 		}
-
-		cond_resched();
 	}
 
 	list_for_each_entry(set, &ctx->table->sets, list) {
-		cond_resched();
-
 		if (!nft_is_active_next(ctx->net, set))
 			continue;
 		if (!(set->flags & NFT_SET_MAP) ||