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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9736D1266B for ; Tue, 5 Nov 2024 09:22:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E6176B0083; Tue, 5 Nov 2024 04:22:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 596306B0098; Tue, 5 Nov 2024 04:22:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4104E6B0099; Tue, 5 Nov 2024 04:22:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 1BE246B0083 for ; Tue, 5 Nov 2024 04:22:07 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 9DEB5AC2EE for ; Tue, 5 Nov 2024 09:22:06 +0000 (UTC) X-FDA: 82751498214.13.A1DC49D Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf24.hostedemail.com (Postfix) with ESMTP id E17EA180004 for ; Tue, 5 Nov 2024 09:21:59 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=t8xCL8Zk; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=oOc32KEc; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=BSqxfb4c; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=eXvIbqU2; spf=pass (imf24.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730798440; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=QAW1SRKrrCcnuofRfZ9A0rSpe7NKVNAfqixSVPJfDfY=; b=ZB6jDpdGdu7/WHTkat/SleObKkK2homeTRayCUIsr6457t6YHODuB+yn8DtaYF9RSDKcYN mXFKuzB3RtQlDZer+bFrdlIHBDQMPRowjSpYl5GLi3HdaN8v5k5Fodk61Hue+TcBhvzYG4 467Lxb+GCN1gHnUsV2fMmJMYBGs6gmI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730798440; a=rsa-sha256; cv=none; b=p8YfIqBxJKh1xkE6hDV+u/FLkhZYLya0WWXRI7KXbyTp6i1gQZ8ikS0kZ3RvjamIarRJfX YBURTjxp3tK+qI3u2MsvrTQOPc0rgKuU0RZIoLy9G/v6HSFvXva2eWe8YqTETj8roYV4aj JmOhHQLbJFYmEgj235NkkyzdKZ8qpp4= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=t8xCL8Zk; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=oOc32KEc; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=BSqxfb4c; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=eXvIbqU2; spf=pass (imf24.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id E7A5921CA3; Tue, 5 Nov 2024 09:22:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1730798523; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=QAW1SRKrrCcnuofRfZ9A0rSpe7NKVNAfqixSVPJfDfY=; b=t8xCL8Zk4LrxtjviQN9fVxtTcEn4EzvFGi2/ED+NsC0+UmO8iNNKuvKCPXixsaRdxvxbN4 V9Q7h2hHpjAV5HVwW/2ycs9gXGmHROnscUWk2VCBVCCMwvyU2NwbHRoRQg609dknIa6QXP 5bTh2X5hKvoZa7Gq74DY5XEwGOowsmE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1730798523; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=QAW1SRKrrCcnuofRfZ9A0rSpe7NKVNAfqixSVPJfDfY=; b=oOc32KEc2zxvFszSdt4D8O0pAAdLm8S6SxuZuErPVGOxhR2WYtolbxfAO6sOT/91okRKPe M2Hw6ta6ZXlNT3Dg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1730798522; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=QAW1SRKrrCcnuofRfZ9A0rSpe7NKVNAfqixSVPJfDfY=; b=BSqxfb4ckzLsSfi+UJspEQx/7CC9xlpYdRdN2KtUsgzmd6ZIxstS9fO3BEJ6zftG+t3Dl8 h1ihaS+QxAx0vJl6oHVQ8Z+wAujjNoXTlc9TZxtdIAjuj7lbHsQskGWRRVw6iXKGhJsMr6 j6MPJEnOSkhtSYFCRNNCFNY3EtDyH2g= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1730798522; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=QAW1SRKrrCcnuofRfZ9A0rSpe7NKVNAfqixSVPJfDfY=; b=eXvIbqU2vdhevOTJQtDvn/pAS7OaFVRDB9sU4yJlpG/z1rOpAVq19ApAr5ux3ICETApBAF rjR/6cdHPoNn/YBQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id D6FA21394A; Tue, 5 Nov 2024 09:22:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id t9sjNLrjKWeEOwAAD6G6ig (envelope-from ); Tue, 05 Nov 2024 09:22:02 +0000 Message-ID: <721aaee9-2680-495a-807c-d188f8329fbb@suse.cz> Date: Tue, 5 Nov 2024 10:22:02 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4] tools/mm: Fix slabinfo crash when MAX_SLABS is exceeded Content-Language: en-US To: Marc Dionne , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Marc Dionne References: <20241031105534.565533-1-marc.c.dionne@gmail.com> From: Vlastimil Babka Autocrypt: addr=vbabka@suse.cz; keydata= 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 EP+ylKVEKb0Q2A== In-Reply-To: <20241031105534.565533-1-marc.c.dionne@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam10 X-Stat-Signature: rdede457fxhm8uutinj5ys1mfcrqyndb X-Rspamd-Queue-Id: E17EA180004 X-Rspam-User: X-HE-Tag: 1730798519-966185 X-HE-Meta: U2FsdGVkX18L4S+A2+MAdiX0AKKSMN8zzBOR4BNpWmcf+0VS4iLxqzbI3R6G6Qw1zok4ConSFV8Qh5wDmlt0LWSdSM3EIVVkkatJFPiUeSo+wQt2riYuhe5S701JWTbIgOiTsLyaJL6ByzqCgV1c43EoQhAjNwd6g0GXDm9l07N/bT5KR4a7nJZY1L5SSZ0KJrm+EmM4VdjhgFBKoktmgt5Pui1WKmNWeSi09k90xn0Rzt/xq8Pkvy71UjUqbDiWOfBlQDsW29+vfdBj6mGjOSqesk9jKAuxNeJMujWisOAhOnHiAqmkAgEvF26B0dTsD0x4cewfwXO4xfanZquXXskpmrEiGdptrvnOk8bZ/sCKVth/bjk49W3OeumFT3pVJu7vdq400MpusCJRBV7ZmdL4/HtYmxvIwZgM3eN1Er7foLlSyBZlseZfn81fAjkp981kxAPWF9y5O8H6f0xjkclyzNCh9kLls9mQ6tv5ZYwDsEjwj8hnUIFhcZjg2Awgb29SGPJjLNXBGtM+J7h9sOx49Mw0UC0ZWNGgHvPRHU6wxc7AxDT6NdXGQ9pTiYglwuoAGDMu6x191rcsQR0LrJTIRddKPaNeQOFb+uCkxmiTXayPtEpstDXCWjDV+P/qIG7/orQdwr2mg1Rqs9fDlhvw2vAeNyHx6rcH1FanCLOiWwv2BhQvqo83vWBhjghYGVs/bNyX/s1WRQf18ZqMkssq40bjy5pNcBWrpdxJGAXHVa8RLAQbRpGZkB2cAeUGIlFaGabIWwFzL7GCj6MVc120OiUrBX/bHnfZtqkT84N6StSU25/V/0kq+Fu/YmnegLkqcB6cLiX3+O2J2jDPQdff4BuJ9lHZo60NlaUVtrjC8aPiOjp+MSKlIdIep/A/AEO4enxfYvZNz6B/SJxdXh23qP1lvHS/RyhEyMLvlufH9W98fclatlYPJ7Z1cFlqzkd5Ur8yMT0L6gAPDem +JqXgaBQ A2ENaXwfix9fg0bAYF+Ana0LF6YocQoEc8RxTHXJAoK5DUgkuDB1mFBr2UloGQ2jKmZxijxvpRu4RGis2yqnvtSzOab5ZbN29Kng0Dfkt/v36mwhWYUTYGXxXwOt2fqazVjsNtFn1NF9tfaO1dXfpR0JTDiCxPpZJZS/37GtDwaboGZBmnkMb6VJKpzBoGtTtTt76J30ELzrx8pSVMPyEfUzrXZlkeLy8CNOmILfd0WmVyTuv0hcO6AMJLCrvTBdNmAGC1KWJ5zjEF0/Et+jUByz8vB4obnaWO5sWBYq6KwMC81n8c608KPKwor23cZJm2/FOkPsO/GxrMiCAopNeeUpXlZVCAMtp2r9XyKoETc/4awlgNPSPruexs3vqfD9ed/zXAd2eqwHv8P8avQpE71KzWCUQeSevaWvtHN8+tpxcFQv8Gf5VyQrg8ebjftluMhgM50t2gReyvf+AymGbaQI0NwzAQwc8qrl1/yaxDsRqF9LTgFk8ri55Dg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 10/31/24 11:55, Marc Dionne wrote: > From: Marc Dionne > > The number of slabs can easily exceed the hard coded MAX_SLABS in the > slabinfo tool, causing it to overwrite memory and crash. > > Increase the value of MAX_SLABS, and check if that has been exceeded for > each new slab, instead of at the end when it's already too late. Also > move the check for MAX_ALIASES into the loop body. > > Signed-off-by: Marc Dionne Acked-by: Vlastimil Babka > --- > tools/mm/slabinfo.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/tools/mm/slabinfo.c b/tools/mm/slabinfo.c > index cfaeaea71042..1a9b807a48c3 100644 > --- a/tools/mm/slabinfo.c > +++ b/tools/mm/slabinfo.c > @@ -21,7 +21,7 @@ > #include > #include > > -#define MAX_SLABS 500 > +#define MAX_SLABS 2000 > #define MAX_ALIASES 500 > #define MAX_NODES 1024 > > @@ -1228,6 +1228,8 @@ static void read_slab_dir(void) > continue; > switch (de->d_type) { > case DT_LNK: > + if (alias - aliasinfo == MAX_ALIASES) > + fatal("Too many aliases\n"); > alias->name = strdup(de->d_name); > count = readlink(de->d_name, buffer, sizeof(buffer)-1); > > @@ -1242,6 +1244,8 @@ static void read_slab_dir(void) > alias++; > break; > case DT_DIR: > + if (slab - slabinfo == MAX_SLABS) > + fatal("Too many slabs\n"); > if (chdir(de->d_name)) > fatal("Unable to access slab %s\n", slab->name); > slab->name = strdup(de->d_name); > @@ -1310,10 +1314,6 @@ static void read_slab_dir(void) > slabs = slab - slabinfo; > actual_slabs = slabs; > aliases = alias - aliasinfo; > - if (slabs > MAX_SLABS) > - fatal("Too many slabs\n"); > - if (aliases > MAX_ALIASES) > - fatal("Too many aliases\n"); > } > > static void output_slabs(void)