From: Luis Henriques <luis.henriques@canonical.com>
To: Kees Cook <keescook@chromium.org>
Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org,
Tejun Heo <tj@kernel.org>, Li Zefan <lizefan@huawei.com>,
Johannes Weiner <hannes@cmpxchg.org>,
cgroups@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH] cgroup: fix seq_show_option merge with legacy_name
Date: Thu, 24 Sep 2015 19:33:28 +0100 [thread overview]
Message-ID: <20150924183328.GA2163@charon> (raw)
In-Reply-To: <20150908183043.GA23974@www.outflux.net>
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/
next prev parent reply other threads:[~2015-09-24 18:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-08 18:30 [PATCH] cgroup: fix seq_show_option merge with legacy_name Kees Cook
[not found] ` <20150908183043.GA23974-0X9Bc/hWBUTk6RaD4rd5nQ@public.gmane.org>
2015-09-08 18:33 ` Tejun Heo
2015-09-09 4:07 ` Zefan Li
2015-09-24 18:33 ` Luis Henriques [this message]
2015-09-24 18:35 ` Kees Cook
2015-09-25 8:52 ` Luis Henriques
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150924183328.GA2163@charon \
--to=luis.henriques@canonical.com \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=hannes@cmpxchg.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=stable@vger.kernel.org \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).