From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: sashal@kernel.org, gregkh@linuxfoundation.org, stable@vger.kernel.org
Subject: [PATCH -stable,5.4 10/10] netfilter: nf_tables: fix scheduling-while-atomic splat
Date: Wed, 5 Jul 2023 18:54:23 +0200 [thread overview]
Message-ID: <20230705165423.50054-11-pablo@netfilter.org> (raw)
In-Reply-To: <20230705165423.50054-1-pablo@netfilter.org>
From: Florian Westphal <fw@strlen.de>
[ 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 f503e3dc33e1..123ef398a10d 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -7428,13 +7428,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
next prev parent reply other threads:[~2023-07-05 16:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-05 16:54 [PATCH -stable,5.4 00/10] stable fixes for 5.4 Pablo Neira Ayuso
2023-07-05 16:54 ` [PATCH -stable,5.4 01/10] netfilter: nf_tables: fix nat hook table deletion Pablo Neira Ayuso
2023-07-05 16:54 ` [PATCH -stable,5.4 02/10] netfilter: nftables: add helper function to set the base sequence number Pablo Neira Ayuso
2023-07-05 16:54 ` [PATCH -stable,5.4 03/10] netfilter: add helper function to set up the nfnetlink header and use it Pablo Neira Ayuso
2023-07-05 16:54 ` [PATCH -stable,5.4 04/10] netfilter: nf_tables: use net_generic infra for transaction data Pablo Neira Ayuso
2023-07-05 16:54 ` [PATCH -stable,5.4 05/10] netfilter: nf_tables: add rescheduling points during loop detection walks Pablo Neira Ayuso
2023-07-05 16:54 ` [PATCH -stable,5.4 06/10] netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE Pablo Neira Ayuso
2023-07-05 16:54 ` [PATCH -stable,5.4 07/10] netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain Pablo Neira Ayuso
2023-07-05 16:54 ` [PATCH -stable,5.4 08/10] netfilter: nf_tables: reject unbound anonymous set before commit phase Pablo Neira Ayuso
2023-07-05 16:54 ` [PATCH -stable,5.4 09/10] netfilter: nf_tables: unbind non-anonymous set if rule construction fails Pablo Neira Ayuso
2023-07-05 16:54 ` Pablo Neira Ayuso [this message]
2023-07-16 19:22 ` [PATCH -stable,5.4 00/10] stable fixes for 5.4 Greg KH
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=20230705165423.50054-11-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.