From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5035C04AB1 for ; Thu, 9 May 2019 18:51:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B24C2183E for ; Thu, 9 May 2019 18:51:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557427909; bh=yJF8lUBdAhNaHazmnRQ+EhrijC77SHZHX6lPsm/ryjI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RVst/+sqo+7tdVDVODJsC3gmYCts6wG3NfTLEwR58dThX1o6/aMjeQkWmqzx+qJv1 SmJ8/oD52WwskeU33DODxwN/uGJN8U1Lj9WG8/GOLo8piFEWlRFZ8ckUVT37nb75qW 8wqSRsq7VbDinb9OaeS702Ni+ogVmxWceza9as1w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728614AbfEISvs (ORCPT ); Thu, 9 May 2019 14:51:48 -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