Messages in this thread Patch in this message | | | Date | Tue, 8 Sep 2015 11:30:43 -0700 | From | Kees Cook <> | Subject | [PATCH] cgroup: fix seq_show_option merge with legacy_name |
| |
When seq_show_option (068acf2ee776) was merged, it did not correctly collide with cgroup's addition of legacy_name (3e1d2eed39d8) changes. This fixes the reported name.
Signed-off-by: Kees Cook <keescook@chromium.org> --- kernel/cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index a8538e443784..2cf0f79f1fc9 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -1342,7 +1342,7 @@ static int cgroup_show_options(struct seq_file *seq, if (root != &cgrp_dfl_root) for_each_subsys(ss, ssid) if (root->subsys_mask & (1 << ssid)) - seq_show_option(seq, ss->name, NULL); + seq_show_option(seq, ss->legacy_name, NULL); if (root->flags & CGRP_ROOT_NOPREFIX) seq_puts(seq, ",noprefix"); if (root->flags & CGRP_ROOT_XATTR) -- 1.9.1
-- Kees Cook Chrome OS Security
| |