* [PATCH] cgroup: fix seq_show_option merge with legacy_name
@ 2015-09-08 18:30 Kees Cook
2015-09-08 18:33 ` Tejun Heo
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Kees Cook @ 2015-09-08 18:30 UTC (permalink / raw)
To: linux-kernel; +Cc: akpm, Tejun Heo, Li Zefan, Johannes Weiner, cgroups
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] cgroup: fix seq_show_option merge with legacy_name 2015-09-08 18:30 [PATCH] cgroup: fix seq_show_option merge with legacy_name Kees Cook @ 2015-09-08 18:33 ` Tejun Heo 2015-09-09 4:07 ` Zefan Li 2015-09-24 18:33 ` Luis Henriques 2 siblings, 0 replies; 6+ messages in thread From: Tejun Heo @ 2015-09-08 18:33 UTC (permalink / raw) To: Kees Cook; +Cc: lkml, Andrew Morton, Li Zefan, Johannes Weiner, Cgroups On Tue, Sep 8, 2015 at 2:30 PM, Kees Cook <keescook@chromium.org> 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: Tejun Heo <tj@kernle.org> Thanks. -- tejun ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] cgroup: fix seq_show_option merge with legacy_name 2015-09-08 18:30 [PATCH] cgroup: fix seq_show_option merge with legacy_name Kees Cook 2015-09-08 18:33 ` Tejun Heo @ 2015-09-09 4:07 ` Zefan Li 2015-09-24 18:33 ` Luis Henriques 2 siblings, 0 replies; 6+ messages in thread From: Zefan Li @ 2015-09-09 4:07 UTC (permalink / raw) To: Kees Cook, linux-kernel; +Cc: akpm, Tejun Heo, Johannes Weiner, cgroups 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> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] cgroup: fix seq_show_option merge with legacy_name 2015-09-08 18:30 [PATCH] cgroup: fix seq_show_option merge with legacy_name Kees Cook 2015-09-08 18:33 ` Tejun Heo 2015-09-09 4:07 ` Zefan Li @ 2015-09-24 18:33 ` Luis Henriques 2015-09-24 18:35 ` Kees Cook 2 siblings, 1 reply; 6+ messages in thread From: Luis Henriques @ 2015-09-24 18:33 UTC (permalink / raw) To: Kees Cook Cc: linux-kernel, akpm, Tejun Heo, Li Zefan, Johannes Weiner, cgroups, stable On Tue, Sep 08, 2015 at 11:30:43AM -0700, 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. > Since a068acf2ee77 ("fs: create and use seq_show_option for escaping") has been CC'ed to stable, shouldn't this be tagged to stable too? (This is upstream commit 61e57c0c3a37 "cgroup: fix seq_show_option merge with legacy_name".) Cheers, -- Luís > 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/ ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] cgroup: fix seq_show_option merge with legacy_name 2015-09-24 18:33 ` Luis Henriques @ 2015-09-24 18:35 ` Kees Cook 2015-09-25 8:52 ` Luis Henriques 0 siblings, 1 reply; 6+ messages in thread From: Kees Cook @ 2015-09-24 18:35 UTC (permalink / raw) To: Luis Henriques Cc: LKML, Andrew Morton, Tejun Heo, Li Zefan, Johannes Weiner, Cgroups, # 3.4.x On Thu, Sep 24, 2015 at 11:33 AM, Luis Henriques <luis.henriques@canonical.com> wrote: > On Tue, Sep 08, 2015 at 11:30:43AM -0700, 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. >> > > Since a068acf2ee77 ("fs: create and use seq_show_option for escaping") > has been CC'ed to stable, shouldn't this be tagged to stable too? > > (This is upstream commit 61e57c0c3a37 "cgroup: fix seq_show_option > merge with legacy_name".) If the cgroup change when to stable also, then yes. -Kees > > Cheers, > -- > Luís > >> 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/ -- Kees Cook Chrome OS Security ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] cgroup: fix seq_show_option merge with legacy_name 2015-09-24 18:35 ` Kees Cook @ 2015-09-25 8:52 ` Luis Henriques 0 siblings, 0 replies; 6+ messages in thread From: Luis Henriques @ 2015-09-25 8:52 UTC (permalink / raw) To: Kees Cook Cc: LKML, Andrew Morton, Tejun Heo, Li Zefan, Johannes Weiner, Cgroups, # 3.4.x On Thu, Sep 24, 2015 at 11:35:00AM -0700, Kees Cook wrote: > On Thu, Sep 24, 2015 at 11:33 AM, Luis Henriques > <luis.henriques@canonical.com> wrote: > > On Tue, Sep 08, 2015 at 11:30:43AM -0700, 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. > >> > > > > Since a068acf2ee77 ("fs: create and use seq_show_option for escaping") > > has been CC'ed to stable, shouldn't this be tagged to stable too? > > > > (This is upstream commit 61e57c0c3a37 "cgroup: fix seq_show_option > > merge with legacy_name".) > > If the cgroup change when to stable also, then yes. > And this didn't happen, so no need to include this commit. Sorry for the noise. Cheers, -- Luís > -Kees > > > > > Cheers, > > -- > > Luís > > > >> 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/ > > > > -- > Kees Cook > Chrome OS Security ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-09-25 8:52 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-09-08 18:30 [PATCH] cgroup: fix seq_show_option merge with legacy_name Kees Cook 2015-09-08 18:33 ` Tejun Heo 2015-09-09 4:07 ` Zefan Li 2015-09-24 18:33 ` Luis Henriques 2015-09-24 18:35 ` Kees Cook 2015-09-25 8:52 ` Luis Henriques
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox