From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757442AbbIXSdf (ORCPT ); Thu, 24 Sep 2015 14:33:35 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:38383 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751853AbbIXSdd (ORCPT ); Thu, 24 Sep 2015 14:33:33 -0400 Date: Thu, 24 Sep 2015 19:33:28 +0100 From: Luis Henriques To: Kees Cook Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, Tejun Heo , Li Zefan , Johannes Weiner , cgroups@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH] cgroup: fix seq_show_option merge with legacy_name Message-ID: <20150924183328.GA2163@charon> References: <20150908183043.GA23974@www.outflux.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20150908183043.GA23974@www.outflux.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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/