lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 350/849] net: net_namespace: Fix undefined member in key_remove_domain()
    Date
    From: Yajun Deng <yajun.deng@linux.dev>

    [ Upstream commit aed0826b0cf2e488900ab92193893e803d65c070 ]

    The key_domain member in struct net only exists if we define CONFIG_KEYS.
    So we should add the define when we used key_domain.

    Fixes: 9b242610514f ("keys: Network namespace domain tag")
    Signed-off-by: Yajun Deng <yajun.deng@linux.dev>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/core/net_namespace.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
    index 9b5a767eddd5f..073db7d0fa790 100644
    --- a/net/core/net_namespace.c
    +++ b/net/core/net_namespace.c
    @@ -477,7 +477,9 @@ struct net *copy_net_ns(unsigned long flags,

    if (rv < 0) {
    put_userns:
    +#ifdef CONFIG_KEYS
    key_remove_domain(net->key_domain);
    +#endif
    put_user_ns(user_ns);
    net_drop_ns(net);
    dec_ucounts:
    @@ -609,7 +611,9 @@ static void cleanup_net(struct work_struct *work)
    list_for_each_entry_safe(net, tmp, &net_exit_list, exit_list) {
    list_del_init(&net->exit_list);
    dec_net_namespaces(net->ucounts);
    +#ifdef CONFIG_KEYS
    key_remove_domain(net->key_domain);
    +#endif
    put_user_ns(net->user_ns);
    net_drop_ns(net);
    }
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 02:40    [W:4.200 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site