From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B693C471253; Tue, 21 Jul 2026 18:00:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784656860; cv=none; b=r/yuH9lz9ONDuPastBzdbpwi50NMZgrHcj7GxiRaEPmPx1trqCEGPeBIII1d0zaeUBFyOhgL5YaYcVZiB/RjAYcogf4qyopEhirnIX0M9qXfS6mWn1QhVlozuEQDaLhhuEdDMQQZikW9xS82OTlxmYZvKzZDOGu0qyoD8hPmEjc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784656860; c=relaxed/simple; bh=kuUeY0F6UnEsqAT/FwGvF54bjf3lxHJE9ntVIcZFRmo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DD3jQNbHYR2UKQZcD2Ud/pOnLve9laUcYRcpc2b/as1uYB0wDBVftXkXqCJeo9egVfIJfBsHZUDBi6rb5D9LENIJDas3VwHFXJAE9AbPtGgGsMzxTzcTtI5cp5Wgk812jLzIjsEDH3jFXR4VTKZsdHpg1u4SAUkdAelSoPmov24= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lmntIIjE; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="lmntIIjE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 299031F00A3A; Tue, 21 Jul 2026 18:00:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784656859; bh=FGDOVIXwt17elooSaFXBcdxFr/BDrhDzEJ4vjfDdcmI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lmntIIjEQZmmV2/V5rFCFsUHIvo4GtSOU3oG/JNycPwNPe5OSi+927j3u8eRGRXsz tIKtIcC3FLX68US+l4Vmd4r8Mu0+C5+v4x3wfdn3iRZ6RBJKT1l9qzkJFVgMBJPMVB 3QkcuFT41isk4Ny74rYYGN5rH9RH9AckpEmSEYLs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yadan Fan , Thomas Bogendoerfer , Sasha Levin Subject: [PATCH 6.18 0545/1611] MIPS: mm: Fix out-of-bounds write in maar_res_walk() Date: Tue, 21 Jul 2026 17:11:01 +0200 Message-ID: <20260721152527.626756990@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152514.750365251@linuxfoundation.org> References: <20260721152514.750365251@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yadan Fan [ Upstream commit 1b001b16bc88f3f7817e228acfd91ee01bdcfcce ] maar_res_walk() uses wi->num_cfg as the index into the fixed-size wi->cfg array, but checks whether the array is full only after it has filled the selected entry. If walk_system_ram_range() reports more than 16 memory ranges, the overflow call writes one struct maar_config past the end of the array before WARN_ON() prevents num_cfg from advancing. Move the full-array check before taking the array slot and return non-zero when the scratch array is full, so walk_system_ram_range() terminates the walk instead of invoking the callback for further ranges. Fixes: a5718fe8f70f ("MIPS: mm: Drop boot_mem_map") Signed-off-by: Yadan Fan Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- arch/mips/mm/init.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 8986048f9b110b..decd201504043c 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c @@ -275,9 +275,15 @@ static int maar_res_walk(unsigned long start_pfn, unsigned long nr_pages, void *data) { struct maar_walk_info *wi = data; - struct maar_config *cfg = &wi->cfg[wi->num_cfg]; + struct maar_config *cfg; unsigned int maar_align; + /* Ensure we don't overflow the cfg array */ + if (WARN_ON(wi->num_cfg >= ARRAY_SIZE(wi->cfg))) + return -1; + + cfg = &wi->cfg[wi->num_cfg]; + /* MAAR registers hold physical addresses right shifted by 4 bits */ maar_align = BIT(MIPS_MAAR_ADDR_SHIFT + 4); @@ -286,9 +292,7 @@ static int maar_res_walk(unsigned long start_pfn, unsigned long nr_pages, cfg->upper = ALIGN_DOWN(PFN_PHYS(start_pfn + nr_pages), maar_align) - 1; cfg->attrs = MIPS_MAAR_S; - /* Ensure we don't overflow the cfg array */ - if (!WARN_ON(wi->num_cfg >= ARRAY_SIZE(wi->cfg))) - wi->num_cfg++; + wi->num_cfg++; return 0; } -- 2.53.0