lkml.org 
[lkml]   [2022]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 213/262] netfilter: nf_tables: prefer kfree_rcu(ptr, rcu) variant
    Date
    From: Eric Dumazet <edumazet@google.com>

    [ Upstream commit ae089831ff28a115908b8d796f667c2dadef1637 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.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 a65b530975f5..2b2e0210a7f9 100644
    --- a/net/netfilter/nf_tables_api.c
    +++ b/net/netfilter/nf_tables_api.c
    @@ -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;
    }
    }
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-03-07 11:24    [W:7.085 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site