From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: gregkh@linuxfoundation.org, stable@vger.kernel.org, sashal@kernel.org
Subject: [PATCH -stable,5.10 v3 11/11] netfilter: nf_tables: fix scheduling-while-atomic splat
Date: Thu, 13 Jul 2023 10:48:59 +0200 [thread overview]
Message-ID: <20230713084859.71541-12-pablo@netfilter.org> (raw)
In-Reply-To: <20230713084859.71541-1-pablo@netfilter.org>
From: Florian Westphal <fw@strlen.de>
[ 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@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nf_tables_api.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 25b834868eac..7e037daaa613 100644
--- 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 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) ||
--
2.30.2
prev parent reply other threads:[~2023-07-13 8:49 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-13 8:48 [PATCH -stable,5.10 v3 00/11] Netfilter stable fixes for 5.10 Pablo Neira Ayuso
2023-07-13 8:48 ` [PATCH -stable,5.10 v3 01/11] netfilter: nf_tables: use net_generic infra for transaction data Pablo Neira Ayuso
2023-07-16 19:18 ` Greg KH
2023-07-16 19:19 ` Greg KH
2023-07-13 8:48 ` [PATCH -stable,5.10 v3 02/11] netfilter: nf_tables: add rescheduling points during loop detection walks Pablo Neira Ayuso
2023-07-13 8:48 ` [PATCH -stable,5.10 v3 03/11] netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE Pablo Neira Ayuso
2023-07-13 8:48 ` [PATCH -stable,5.10 v3 04/11] netfilter: nf_tables: fix chain binding transaction logic Pablo Neira Ayuso
2023-07-13 8:48 ` [PATCH -stable,5.10 v3 05/11] netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain Pablo Neira Ayuso
2023-07-13 8:48 ` [PATCH -stable,5.10 v3 06/11] netfilter: nf_tables: reject unbound anonymous set before commit phase Pablo Neira Ayuso
2023-07-13 8:48 ` [PATCH -stable,5.10 v3 07/11] netfilter: nf_tables: reject unbound chain " Pablo Neira Ayuso
2023-07-13 8:48 ` [PATCH -stable,5.10 v3 08/11] netfilter: nftables: rename set element data activation/deactivation functions Pablo Neira Ayuso
2023-07-13 8:48 ` [PATCH -stable,5.10 v3 09/11] netfilter: nf_tables: drop map element references from preparation phase Pablo Neira Ayuso
2023-07-13 8:48 ` [PATCH -stable,5.10 v3 10/11] netfilter: nf_tables: unbind non-anonymous set if rule construction fails Pablo Neira Ayuso
2023-07-13 8:48 ` Pablo Neira Ayuso [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230713084859.71541-12-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=gregkh@linuxfoundation.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).