mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-06 19:08:57 +09:00
netfilter: nf_tables: prefer kfree_rcu(ptr, rcu) variant
[ Upstream commitae089831ff] 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:aaa31047a6("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> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
4ed52fbeb9
commit
9920d99cc8
@@ -4486,7 +4486,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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5653,7 +5653,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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user