5.4-stable patches

added patches:
	cgroup-v1-add-disabled-controller-check-in-cgroup1_parse_param.patch

diff --git a/queue-5.4/cgroup-v1-add-disabled-controller-check-in-cgroup1_parse_param.patch b/queue-5.4/cgroup-v1-add-disabled-controller-check-in-cgroup1_parse_param.patch
new file mode 100644 (file)
index 0000000..78920de
--- /dev/null
+++ b/queue-5.4/cgroup-v1-add-disabled-controller-check-in-cgroup1_parse_param.patch
@@ -0,0 +1,46 @@
+From 61e960b07b637f0295308ad91268501d744c21b5 Mon Sep 17 00:00:00 2001
+From: Chen Zhou <chenzhou10@huawei.com>
+Date: Fri, 15 Jan 2021 17:37:17 +0800
+Subject: cgroup-v1: add disabled controller check in cgroup1_parse_param()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Chen Zhou <chenzhou10@huawei.com>
+
+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: f5dfb5315d34 ("cgroup: take options parsing into ->parse_monolithic()")
+Signed-off-by: Chen Zhou <chenzhou10@huawei.com>
+Reviewed-by: Zefan Li <lizefan.x@bytedance.com>
+Reviewed-by: Michal Koutný <mkoutny@suse.com>
+Signed-off-by: Tejun Heo <tj@kernel.org>
+Signed-off-by: Luiz Capitulino <luizcap@amazon.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/cgroup/cgroup-v1.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/kernel/cgroup/cgroup-v1.c
++++ b/kernel/cgroup/cgroup-v1.c
+@@ -944,6 +944,9 @@ int cgroup1_parse_param(struct fs_contex
+               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;
+               }

diff --git a/queue-5.4/series b/queue-5.4/series
index edeede61ec27dcf3e5e19d35f96bb967b2ebeef0..c4f6b3963928ec806d35779fa9aec384bb125bfd 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -25,3 +25,4 @@ xfs-clear-xfs_dq_freeing-if-we-can-t-lock-the-dquot-buffer-to-flush.patch
 xfs-force-the-log-after-remapping-a-synchronous-writes-file.patch
 xen-gntdev-don-t-ignore-kernel-unmapping-error.patch
 xen-gntdev-prevent-leaking-grants.patch
+cgroup-v1-add-disabled-controller-check-in-cgroup1_parse_param.patch