Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a2d7c93 authored by Chen Zhou's avatar Chen Zhou Committed by Greg Kroah-Hartman
Browse files

cgroup-v1: add disabled controller check in cgroup1_parse_param() 



commit 61e960b07b637f0295308ad91268501d744c21b5 upstream.

When mounting a cgroup hierarchy with disabled controller in cgroup v1,
all available controllers will be attached.
For example, boot with cgroup_no_v1=cpu or cgroup_disable=cpu, and then
mount with "mount -t cgroup -ocpu cpu /sys/fs/cgroup/cpu", then all
enabled controllers will be attached except cpu.

Fix this by adding disabled controller check in cgroup1_parse_param().
If the specified controller is disabled, just return error with information
"Disabled controller xx" rather than attaching all the other enabled
controllers.

Fixes: f5dfb531 ("cgroup: take options parsing into ->parse_monolithic()")
Signed-off-by: default avatarChen Zhou <chenzhou10@huawei.com>
Reviewed-by: default avatarZefan Li <lizefan.x@bytedance.com>
Reviewed-by: default avatarMichal Koutný <mkoutny@suse.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarLuiz Capitulino <luizcap@amazon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3d056d81

kernel/cgroup/cgroup-v1.c

+3 −0
Original line number Diff line number Diff line
@@ -944,6 +944,9 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param) 
		for_each_subsys(ss, i) {

			if (strcmp(param->key, ss->legacy_name))

				continue;

			if (!cgroup_ssid_enabled(i) || cgroup1_ssid_disabled(i))

				return invalf(fc, "Disabled controller '%s'",

					       param->key);

			ctx->subsys_mask |= (1 << i);

			return 0;

		}