Commit c4d9235a authored by Chen Ridong's avatar Chen Ridong
Browse files

Revert "cgroup: fix uaf when proc_cpuset_show" 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IA9YQ9



--------------------------------

To keep the same with the mainline and backport the lts patch.
This reverts commit 46daffa4.

Fixes: 46daffa4 ("[Huawei] cgroup: fix uaf when proc_cpuset_show")
Signed-off-by: default avatarChen Ridong <chenridong@huawei.com>
parent 3deaff6e

kernel/cgroup/cpuset.c

+0 −24
Original line number Diff line number Diff line
@@ -3661,7 +3661,6 @@ int proc_cpuset_show(struct seq_file *m, struct pid_namespace *ns, 
	char *buf;

	struct cgroup_subsys_state *css;

	int retval;

	struct cgroup *root_cgroup = NULL;



	retval = -ENOMEM;

	buf = kmalloc(PATH_MAX, GFP_KERNEL);
@@ -3669,32 +3668,9 @@ int proc_cpuset_show(struct seq_file *m, struct pid_namespace *ns, 
		goto out;



	css = task_get_css(tsk, cpuset_cgrp_id);

	rcu_read_lock();

	/*

	 * When the cpuset subsystem is mounted on the legacy hierarchy,

	 * the top_cpuset.css->cgroup does not hold a reference count of

	 * cgroup_root.cgroup. This makes accessing css->cgroup very

	 * dangerous because when the cpuset subsystem is remounted to the

	 * default hierarchy, the cgroup_root.cgroup that css->cgroup points

	 * to will be released, leading to a UAF issue. To avoid this problem,

	 * get the reference count of top_cpuset.css->cgroup first.

	 *

	 * This is ugly!!

	 */

	if (css == &top_cpuset.css) {

		root_cgroup = css->cgroup;

		if (!css_tryget_online(&root_cgroup->self)) {

			rcu_read_unlock();

			retval = -EBUSY;

			goto out_free;

		}

	}

	rcu_read_unlock();

	retval = cgroup_path_ns(css->cgroup, buf, PATH_MAX,

				current->nsproxy->cgroup_ns);

	css_put(css);

	if (root_cgroup)

		css_put(&root_cgroup->self);

	if (retval >= PATH_MAX)

		retval = -ENAMETOOLONG;

	if (retval < 0)