On Fri, Oct 28, 2022 at 07:11:13PM +0000, Luiz Capitulino wrote: > From: Chen Zhou <chenzhou10@xxxxxxxxxx> > > Commit 61e960b07b637f0295308ad91268501d744c21b5 upstream. > > [ This backport uses invalf() instead of invalfc() since the latter is > only available starting with v5.6 ] > > 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@xxxxxxxxxx> > Reviewed-by: Zefan Li <lizefan.x@xxxxxxxxxxxxx> > Reviewed-by: Michal Koutný <mkoutny@xxxxxxxx> > Signed-off-by: Tejun Heo <tj@xxxxxxxxxx> > Signed-off-by: Luiz Capitulino <luizcap@xxxxxxxxxx> > --- > kernel/cgroup/cgroup-v1.c | 3 +++ > 1 file changed, 3 insertions(+) > > Reviewers, > > Only 5.4-stable is affected. The issue was introduced in 5.1 and fixed > by Chen in 5.11 and 5.10-stable. > > I tested the same reproducer on Amazon Linux 2 as described in the > commit message (well, except that I used the cpuset controller). Now queued up, thanks. greg k-h