From: =?utf-8?b?TWljaGFsIEtvdXRuw70gPG1rb3V0bnlAc3VzZS5jb20+?=

Date: Fri, 26 Aug 2022 18:52:36 +0200

Subject: cgroup: cgroup: Honor caller's cgroup NS when resolving cgroup id

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Git-commit: 4534dee941056a4ab9dca4a9e2edff28692800b2

Patch-mainline: v6.1-rc1

References: bsc#1205650

Cgroup ids are resolved in the global scope. That may be needed sometime

(in future) but currently it violates virtual view provided through

cgroup namespaces.

There are currently following users of the resolution:

- fc_appid_store

- bpf_iter_attach_cgroup

- mem_cgroup_get_from_ino

None of the is a called on behalf of kernel but the resolution is made

with proper userspace context, hence the default to current->nsproxy

makes sens. (This doesn't rule out cgroup_get_from_id with cgroup NS

parameter in the future.)

Since cgroup ids are defined on v2 hierarchy only, we simply check

existence in the cgroup namespace by looking at ancestry on the default

hierarchy.

Fixes: 6b658c4863c1 ("scsi: cgroup: Add cgroup_get_from_id()")

Signed-off-by: Michal Koutný <mkoutny@suse.com>

Signed-off-by: Tejun Heo <tj@kernel.org>

---

 kernel/cgroup/cgroup.c |   14 +++++++++++++-

 1 file changed, 13 insertions(+), 1 deletion(-)

--- a/kernel/cgroup/cgroup.c

+++ b/kernel/cgroup/cgroup.c

@@ -6003,11 +6003,12 @@ void cgroup_path_from_kernfs_id(u64 id,

  * cgroup_get_from_id : get the cgroup associated with cgroup id

  * @id: cgroup id

  * On success return the cgrp, on failure return NULL

+ * Only cgroups within current task's cgroup NS are valid.

  */

 struct cgroup *cgroup_get_from_id(u64 id)

 {

 	struct kernfs_node *kn;

-	struct cgroup *cgrp = NULL;

+	struct cgroup *cgrp = NULL, *root_cgrp;

 	kn = kernfs_find_and_get_node_by_id(cgrp_dfl_root.kf_root, id);

 	if (!kn)

@@ -6025,6 +6026,17 @@ struct cgroup *cgroup_get_from_id(u64 id

 	rcu_read_unlock();

 put:

 	kernfs_put(kn);

+

+	if (!cgrp)

+		goto out;

+

+	spin_lock_irq(&css_set_lock);

+	root_cgrp = current_cgns_cgroup_from_root(&cgrp_dfl_root);

+	spin_unlock_irq(&css_set_lock);

+	if (!cgroup_is_descendant(cgrp, root_cgrp)) {

+		cgroup_put(cgrp);

+		cgrp = NULL;

+	}

 out:

 	return cgrp;

 }