netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org, kuba@kernel.org
Subject: [PATCH net 1/8] netfilter: nf_tables: prefer kfree_rcu(ptr, rcu) variant
Date: Tue,  1 Mar 2022 22:53:30 +0100	[thread overview]
Message-ID: <20220301215337.378405-2-pablo@netfilter.org> (raw)
In-Reply-To: <20220301215337.378405-1-pablo@netfilter.org>

From: Eric Dumazet <edumazet@google.com>

While kfree_rcu(ptr) _is_ supported, it has some limitations.

Given that 99.99% of kfree_rcu() users [1] use the legacy
two parameters variant, and @catchall objects do have an rcu head,
simply use it.

Choice of kfree_rcu(ptr) variant was probably not intentional.

[1] including calls from net/netfilter/nf_tables_api.c

Fixes: aaa31047a6d2 ("netfilter: nftables: add catch-all set element support")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-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, 2 insertions(+), 2 deletions(-)

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 9cd1d7a62804..c86748b3873b 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -4502,7 +4502,7 @@ static void nft_set_catchall_destroy(const struct nft_ctx *ctx,
 	list_for_each_entry_safe(catchall, next, &set->catchall_list, list) {
 		list_del_rcu(&catchall->list);
 		nft_set_elem_destroy(set, catchall->elem, true);
-		kfree_rcu(catchall);
+		kfree_rcu(catchall, rcu);
 	}
 }
 
@@ -5669,7 +5669,7 @@ static void nft_setelem_catchall_remove(const struct net *net,
 	list_for_each_entry_safe(catchall, next, &set->catchall_list, list) {
 		if (catchall->elem == elem->priv) {
 			list_del_rcu(&catchall->list);
-			kfree_rcu(catchall);
+			kfree_rcu(catchall, rcu);
 			break;
 		}
 	}
-- 
2.30.2


  reply	other threads:[~2022-03-01 21:53 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-01 21:53 [PATCH net 0/8] Netfilter fixes for net Pablo Neira Ayuso
2022-03-01 21:53 ` Pablo Neira Ayuso [this message]
2022-03-01 23:30   ` [PATCH net 1/8] netfilter: nf_tables: prefer kfree_rcu(ptr, rcu) variant patchwork-bot+netdevbpf
2022-03-01 21:53 ` [PATCH net 2/8] netfilter: fix use-after-free in __nf_register_net_hook() Pablo Neira Ayuso
2022-03-01 21:53 ` [PATCH net 3/8] netfilter: egress: silence egress hook lockdep splats Pablo Neira Ayuso
2022-03-01 21:53 ` [PATCH net 4/8] netfilter: nf_queue: don't assume sk is full socket Pablo Neira Ayuso
2022-03-01 21:53 ` [PATCH net 5/8] selftests: netfilter: add nfqueue TCP_NEW_SYN_RECV socket race test Pablo Neira Ayuso
2022-03-01 21:53 ` [PATCH net 6/8] netfilter: nf_queue: fix possible use-after-free Pablo Neira Ayuso
2022-03-01 21:53 ` [PATCH net 7/8] netfilter: nf_queue: handle socket prefetch Pablo Neira Ayuso
2022-03-01 21:53 ` [PATCH net 8/8] net/sched: act_ct: Fix flow table lookup failure with no originating ifindex Pablo Neira Ayuso

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=20220301215337.378405-2-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=davem@davemloft.net \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@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).