This is a note to let you know that I've just added the patch titled netfilter: nf_tables: fix scheduling-while-atomic splat to the 5.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: netfilter-nf_tables-fix-scheduling-while-atomic-splat.patch and it can be found in the queue-5.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From stable-owner@xxxxxxxxxxxxxxx Thu Jul 13 10:49:58 2023 From: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> Date: Thu, 13 Jul 2023 10:48:59 +0200 Subject: netfilter: nf_tables: fix scheduling-while-atomic splat To: netfilter-devel@xxxxxxxxxxxxxxx Cc: gregkh@xxxxxxxxxxxxxxxxxxx, stable@xxxxxxxxxxxxxxx, sashal@xxxxxxxxxx Message-ID: <20230713084859.71541-12-pablo@xxxxxxxxxxxxx> From: Florian Westphal <fw@xxxxxxxxx> [ Upstream commit 2024439bd5ceb145eeeb428b2a59e9b905153ac3 ] 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@xxxxxxxxx> Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- net/netfilter/nf_tables_api.c | 4 ---- 1 file changed, 4 deletions(-) --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -8684,13 +8684,9 @@ static int nf_tables_check_loops(const s 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) || Patches currently in stable-queue which might be from stable-owner@xxxxxxxxxxxxxxx are queue-5.10/netfilter-nf_tables-fix-chain-binding-transaction-logic.patch queue-5.10/netfilter-nf_tables-drop-map-element-references-from-preparation-phase.patch queue-5.10/netfilter-nf_tables-fix-scheduling-while-atomic-splat.patch queue-5.10/netfilter-nf_tables-reject-unbound-anonymous-set-before-commit-phase.patch queue-5.10/netfilter-nf_tables-use-net_generic-infra-for-transaction-data.patch queue-5.10/netfilter-nftables-rename-set-element-data-activation-deactivation-functions.patch queue-5.10/netfilter-nf_tables-incorrect-error-path-handling-with-nft_msg_newrule.patch queue-5.10/netfilter-nf_tables-reject-unbound-chain-set-before-commit-phase.patch queue-5.10/netfilter-nf_tables-add-rescheduling-points-during-loop-detection-walks.patch queue-5.10/netfilter-nf_tables-add-nft_trans_prepare_error-to-deal-with-bound-set-chain.patch queue-5.10/netfilter-nf_tables-unbind-non-anonymous-set-if-rule-construction-fails.patch