netfilter: nf_tables: prefer kfree_rcu(ptr, rcu) variant

edumazet · ummakynes · commit ae089831ff28 · 2022-02-23T09:22:46.000+01:00
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: aaa3104 ("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>
diff --git 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;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -4502,7 +4502,7 @@ static void nft_set_catchall_destroy(const struct nft_ctx *ctx,`
`4502`	`4502`	`list_for_each_entry_safe(catchall, next, &set->catchall_list, list) {`
`4503`	`4503`	`list_del_rcu(&catchall->list);`
`4504`	`4504`	`nft_set_elem_destroy(set, catchall->elem, true);`
`4505`		`- kfree_rcu(catchall);`
	`4505`	`+ kfree_rcu(catchall, rcu);`
`4506`	`4506`	`}`
`4507`	`4507`	`}`
`4508`	`4508`
`@@ -5669,7 +5669,7 @@ static void nft_setelem_catchall_remove(const struct net *net,`
`5669`	`5669`	`list_for_each_entry_safe(catchall, next, &set->catchall_list, list) {`
`5670`	`5670`	`if (catchall->elem == elem->priv) {`
`5671`	`5671`	`list_del_rcu(&catchall->list);`
`5672`		`- kfree_rcu(catchall);`
	`5672`	`+ kfree_rcu(catchall, rcu);`
`5673`	`5673`	`break;`
`5674`	`5674`	`}`
`5675`	`5675`	`}`