lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 628/862] cgroup: Honor callers cgroup NS when resolving path
    Date
    From: Michal Koutný <mkoutny@suse.com>

    [ Upstream commit 74e4b956eb1cac0e4c10c240339b1bbfbc9a4c48 ]

    cgroup_get_from_path() is not widely used function. Its callers presume
    the path is resolved under cgroup namespace. (There is one caller
    currently and resolving in init NS won't make harm (netfilter). However,
    future users may be subject to different effects when resolving
    globally.)
    Since, there's currently no use for the global resolution, modify the
    existing function to take cgroup NS into account.

    Fixes: a79a908fd2b0 ("cgroup: introduce cgroup namespaces")
    Signed-off-by: Michal Koutný <mkoutny@suse.com>
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/cgroup/cgroup.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
    index 5f2090d051ac..29296a6374ef 100644
    --- a/kernel/cgroup/cgroup.c
    +++ b/kernel/cgroup/cgroup.c
    @@ -6638,8 +6638,12 @@ struct cgroup *cgroup_get_from_path(const char *path)
    {
    struct kernfs_node *kn;
    struct cgroup *cgrp = ERR_PTR(-ENOENT);
    + struct cgroup *root_cgrp;

    - kn = kernfs_walk_and_get(cgrp_dfl_root.cgrp.kn, path);
    + spin_lock_irq(&css_set_lock);
    + root_cgrp = current_cgns_cgroup_from_root(&cgrp_dfl_root);
    + kn = kernfs_walk_and_get(root_cgrp->kn, path);
    + spin_unlock_irq(&css_set_lock);
    if (!kn)
    goto out;

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 13:12    [W:4.286 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site