From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755568AbbIHSbc (ORCPT ); Tue, 8 Sep 2015 14:31:32 -0400 Received: from smtp.outflux.net ([198.145.64.163]:55921 "EHLO smtp.outflux.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755538AbbIHSbW (ORCPT ); Tue, 8 Sep 2015 14:31:22 -0400 Date: Tue, 8 Sep 2015 11:30:43 -0700 From: Kees Cook To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, Tejun Heo , Li Zefan , Johannes Weiner , cgroups@vger.kernel.org Subject: [PATCH] cgroup: fix seq_show_option merge with legacy_name Message-ID: <20150908183043.GA23974@www.outflux.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-HELO: www.outflux.net Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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