Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1169193yba; Thu, 9 May 2019 11:54:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqxz77zc6r5ncJd80BWgTbVcwAOlkQsz94f2IM+0drKTBib0gfNC7J6bg4e8jv5y26FeSlm0 X-Received: by 2002:a63:5a4b:: with SMTP id k11mr7774766pgm.119.1557428063398; Thu, 09 May 2019 11:54:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557428063; cv=none; d=google.com; s=arc-20160816; b=mxut0drCsO+IS4/WmF+vgBALUm9aHJKbD9UVTVwq2YD8TfrUFXA39U8J2dCgYsQZ1R WRQ4EGHrAL0kTHma8v3srWZ3SD5O/UX9FITYOI3I8fmZgpQ/duJXbH9dt2NzO45sxDUq l9JbXS+OU2Bg+6U0B6ON2BxxZrpzFrNgyFfzfwlpwm4xAU8RO3AqN93POKtow1ac1FKo V8PpF9fXNwmQkANiNPv+qs9SyuqeWiT3AZvtG2PSqAVgyCZYSYnlJiZdxkWLqk8anbty RDM4+8aBH5Cn2KsbsquAOvmZ5nBq+U0RybhbNm5MYqoEoCqUWUvxsCjGTmzuJI2zjQCA lBqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GXCYdh8sqDrlE2AZxV+zFLEoLlIoMfHsADjYObT3Xrc=; b=LfkwlWlQTZ4GkP4KpqEoB3aCiFRT+6S9n8LqrV9cKriT98X0vsPRmdfs/cx6zUK5DV jRnD9+jt4cNc4YYBQN6MgYH2JLfLEdnX/VLbue7HhVvF7+byXazr750DASEkzBOfbrsH jjt30Jm9HXry68Mgx+Vct8LyJv20wfT2mfGnQl2k2D2TS4eBBm40iyp/zhKD0xii3rXA FoaZ0Mhm/kw4Az0ntJNzU133Qfnmx1BD9s6J/aZ7EJuna2zq4XAaDGM+2G2eERTWEX84 RQWOqe2TI0FY1BHuF+UgD8i8eLG/+15ca41adPpIOof6KYetl1Jqu/HoYryMg7MV5xp0 rETQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ndgPu2W3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m2si4028279pgp.463.2019.05.09.11.54.06; Thu, 09 May 2019 11:54:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ndgPu2W3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728610AbfEISvr (ORCPT + 99 others); Thu, 9 May 2019 14:51:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:45586 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727147AbfEISvp (ORCPT ); Thu, 9 May 2019 14:51:45 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4C6C1217D7; Thu, 9 May 2019 18:51:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557427904; bh=yJF8lUBdAhNaHazmnRQ+EhrijC77SHZHX6lPsm/ryjI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ndgPu2W3BnaMCQahXz17j/TrqFcrBBeZeI/Q9d8gBCcumXsJ8HnHDrofkPQNDULkc T9GAl+U/p6ePaf4G5b0+1acQpzTuMdWUQREyXPbvURFDwShexGJ+ynLsFI/Qj0IqQb EGgCskxpZQI2mP96BW7CWWynJGTp35XII3/MJqRc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qian Cai , "Tobin C. Harding" , Tejun Heo , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH 5.0 48/95] slab: fix a crash by reading /proc/slab_allocators Date: Thu, 9 May 2019 20:42:05 +0200 Message-Id: <20190509181312.836321156@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190509181309.180685671@linuxfoundation.org> References: <20190509181309.180685671@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit fcf88917dd435c6a4cb2830cb086ee58605a1d85 ] The commit 510ded33e075 ("slab: implement slab_root_caches list") changes the name of the list node within "struct kmem_cache" from "list" to "root_caches_node", but leaks_show() still use the "list" which causes a crash when reading /proc/slab_allocators. You need to have CONFIG_SLAB=y and CONFIG_MEMCG=y to see the problem, because without MEMCG all slab caches are root caches, and the "list" node happens to be the right one. Fixes: 510ded33e075 ("slab: implement slab_root_caches list") Signed-off-by: Qian Cai Reviewed-by: Tobin C. Harding Cc: Tejun Heo Cc: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- mm/slab.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/slab.c b/mm/slab.c index 2f2aa8eaf7d98..188c4b65255dc 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -4297,7 +4297,8 @@ static void show_symbol(struct seq_file *m, unsigned long address) static int leaks_show(struct seq_file *m, void *p) { - struct kmem_cache *cachep = list_entry(p, struct kmem_cache, list); + struct kmem_cache *cachep = list_entry(p, struct kmem_cache, + root_caches_node); struct page *page; struct kmem_cache_node *n; const char *name; -- 2.20.1