Commit b71792e4 authored by Tetsuo Handa's avatar Tetsuo Handa Committed by Jialin Zhang
Browse files

cgroup: Add missing cpus_read_lock() to cgroup_attach_task_all() 

stable inclusion
from stable-v5.10.145
commit 9f267393b036f1470fb12fb892d59e7ff8aeb58d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I60G94
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.145&id=9f267393b036f1470fb12fb892d59e7ff8aeb58d

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

commit 43626dad upstream.

syzbot is hitting percpu_rwsem_assert_held(&cpu_hotplug_lock) warning at
cpuset_attach() [1], for commit 4f7e7236 ("cgroup: Fix
threadgroup_rwsem <-> cpus_read_lock() deadlock") missed that
cpuset_attach() is also called from cgroup_attach_task_all().
Add cpus_read_lock() like what cgroup_procs_write_start() does.

Link: https://syzkaller.appspot.com/bug?extid=29d3a3b4d86c8136ad9e

 [1]
Reported-by: default avatarsyzbot <syzbot+29d3a3b4d86c8136ad9e@syzkaller.appspotmail.com>
Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Fixes: 4f7e7236 ("cgroup: Fix threadgroup_rwsem <-> cpus_read_lock() deadlock")
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarCai Xinchen <caixinchen1@huawei.com>
Reviewed-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Reviewed-by: default avatarWang Weiyang <wangweiyang2@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent eb002abd

kernel/cgroup/cgroup-v1.c

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ int cgroup_attach_task_all(struct task_struct *from, struct task_struct *tsk) 
	int retval = 0;



	mutex_lock(&cgroup_mutex);

	cpus_read_lock();

	percpu_down_write(&cgroup_threadgroup_rwsem);

	for_each_root(root) {

		struct cgroup *from_cgrp;
@@ -73,6 +74,7 @@ int cgroup_attach_task_all(struct task_struct *from, struct task_struct *tsk) 
			break;

	}

	percpu_up_write(&cgroup_threadgroup_rwsem);

	cpus_read_unlock();

	mutex_unlock(&cgroup_mutex);



	return retval;