Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1221033 > unrolled thread

[PATCH] cgroup: fix seq_show_option merge with legacy_name

Started byKees Cook <keescook@chromium.org>
First post2015-09-08 20:40 +0200
Last post2015-09-09 06:10 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] cgroup: fix seq_show_option merge with legacy_name Kees Cook <keescook@chromium.org> - 2015-09-08 20:40 +0200
    Re: [PATCH] cgroup: fix seq_show_option merge with legacy_name Zefan Li <lizefan@huawei.com> - 2015-09-09 06:10 +0200

#1221033 — [PATCH] cgroup: fix seq_show_option merge with legacy_name

FromKees Cook <keescook@chromium.org>
Date2015-09-08 20:40 +0200
Subject[PATCH] cgroup: fix seq_show_option merge with legacy_name
Message-ID<q6vYd-40J-3@gated-at.bofh.it>
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]


#1221220

FromZefan Li <lizefan@huawei.com>
Date2015-09-09 06:10 +0200
Message-ID<q6ERP-8s-13@gated-at.bofh.it>
In reply to#1221033
On 2015/9/9 2:30, Kees Cook wrote:
> 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>

Acked-by: Zefan Li <lizefan@huawei.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web