From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755873AbbIYIwr (ORCPT <rfc822;w@1wt.eu>);
	Fri, 25 Sep 2015 04:52:47 -0400
Received: from youngberry.canonical.com ([91.189.89.112]:44959 "EHLO
	youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755830AbbIYIwo (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 25 Sep 2015 04:52:44 -0400
Date: Fri, 25 Sep 2015 09:52:41 +0100
From: Luis Henriques <luis.henriques@canonical.com>
To: Kees Cook <keescook@chromium.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>, Tejun Heo <tj@kernel.org>,
        Li Zefan <lizefan@huawei.com>, Johannes Weiner <hannes@cmpxchg.org>,
        Cgroups <cgroups@vger.kernel.org>, "# 3.4.x" <stable@vger.kernel.org>
Subject: Re: [PATCH] cgroup: fix seq_show_option merge with legacy_name
Message-ID: <20150925085241.GA2557@ares>
References: <20150908183043.GA23974@www.outflux.net>
 <20150924183328.GA2163@charon>
 <CAGXu5jLtaEdTmX2QzgfrB=J=tWaoc3Bt_uAstep8UyKdh8v-OQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CAGXu5jLtaEdTmX2QzgfrB=J=tWaoc3Bt_uAstep8UyKdh8v-OQ@mail.gmail.com>
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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