From nobody Mon Jun 8 21:59:58 2026 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9CEEF36D4F3 for ; Tue, 26 May 2026 09:20:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779787219; cv=none; b=n4laJIOZa+CL3YN+TePrdtrGWAYyrdciAs1h59PmUs1j5DJiMgVKdslqnzcLzFYtLa/Vmysm1rnS/zGH7MKxgUOuGGY3bTwf8zRd0wPWlWpvY/XaptzPs1a2rjHbUdP4X2qKgEUjRd8NVMgn+sO/ggnxzri98nRA4JTGv+VuuFw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779787219; c=relaxed/simple; bh=CImFGm/90Ms6MFAUDh6k6PapoRhKGLaFom+/seJQMv0=; h=Message-ID:Date:MIME-Version:To:Cc:From:Subject:Content-Type; b=pRs5E4x3/nmWUlGz929tkWS6x9zjhL73/LQ50GfFXZIHlW1+OXh+92e9FteKrusEFMIcuWxblPKeOC5TU+4H8CyImyu3/BizLd6etnq3Nl04sui1E/S12Kput3616pcDod/aMybg7JTp4+LU6OloZmsqA76FhGpcSsygvGA9a8c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=O2D6H54Y; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="O2D6H54Y" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4891e5b9c1fso88761975e9.2 for ; Tue, 26 May 2026 02:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1779787216; x=1780392016; darn=vger.kernel.org; h=content-transfer-encoding:subject:from:cc:to:content-language :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=k3bSEbQjKgH36Xf4Q1BYUTKv9fzxxL5s+NU5lEV8n1w=; b=O2D6H54YxmVpZptABD5Njo40n9FqfwuGtn9X8F+2IuPkBPNliyl6utWW3wslun9Nm7 oSsRTBD8v2YI9ZOQgtA8IK8AxOT5qrSrhc24rjdqEyNOR0f2Gzc+yQTavrTTKIpwgw0P tAxe/rgHlNIBgXRqbiw2znKMjFxwE4cpx3RQurZjYfu0hi3o0LvjAiA4rHn/ndpSbr6l g2TQyJK2aMcwmzyky89jBThdU6WNru0Aa5r/Uzvhox6nfEQasnRhGa89axyVFkZTU09d JQPjySigRDZgotMBHLqZgwckj63fvhq83EfNY/i8xGNa/HjMGmUjfdtD4ykf5GohGM7K nYTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779787216; x=1780392016; h=content-transfer-encoding:subject:from:cc:to:content-language :user-agent:mime-version:date:message-id:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=k3bSEbQjKgH36Xf4Q1BYUTKv9fzxxL5s+NU5lEV8n1w=; b=IB7svL80VcSQV6jdjnQm2WMbvmEiL8c1WNr9n64Hzv6Q9o8DVZEEYFhBR2ToyLEeDZ FSVVUVwJpSEbMKpo7a6BpgtkFncTlPOuTvIS18MSUCODUWSRW5dGMttaxsz+1GW41P2b ofQqgJAOVZ89iW0RbfzTumJhbTOspvfLi94ddrKeiFjniLElAe44wwAZ6f8jkDomkzoD owW3qvl1y43T2KevVjogOAQFdgaoXGS34kRVW4gH7sboMaOy9tMkH7tUelps0phT7Yh2 Prifzq5erTchryIdT8CUjPJiS6LueI1wN7z/e0xwR6Q9GSW61cx9+6jU+ZEzskyecjR4 lOJA== X-Forwarded-Encrypted: i=1; AFNElJ9zqISNxZcd7xlT7Z/Dzs/nXEQTT/2mnnuPUfZQfXdGRDzTTYXbtDNHNXMP4/shHXckO+ASbrnw2vkgD1E=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7qibUnUjSj4OR86b9yPkPwWd6U8skvYUQXFoGJseYef3Nv3vM kOVhzm8yHZNUpj7t8C/Jw1F2Lbddla1bYfzhufdM2+fDw9bhVNSLUCkxWCU1vcjnEGQjcEfkuPP LvKAHxzY= X-Gm-Gg: Acq92OEC1J06LBIO50fXmJvdcn2cgoDAsSiGSMkfy/DsMecRYWdlE1eRZ/QgOKofk3O gHKo4c6dMDOR48PxlQYnitlBuL12DpXz1pwe0X5I/kKEFeSXhPL/MGCgTjOqsrx5yXeFdtyMM8i CbMo5GniKy7GUsFpdHGj5JmPt//3xqA/a+/VUkF3sXnS64MG/O23JufdvCZ7xdon0HUoq9Z4A1f +dkBqVDRV2A1W1G5NbnnAsJnfjkZTXLtVR2qxw+Vhs0hmtBwF8hyfiS/xTqNiWLJsDoRELmLQC/ vjsuyHIfWkZH5Ce4oCT7g6+EMkTNv8ADNxofolju7wEvQqMh2fwOKA8eT/mm8WRGompMdE/9fhq 6PjK8hquzeb/mmQXsyOIolVvnPxZr3l8gV6yle0G6pEDamhvnvyOHzh9sMn14zl9Mri5w5LrDRV AJWXJrtm28pprds3KmwlzvXDfDc72W20IrOVrQwjrFKYyMgB8sPrZS53uv6txcOPXnwiB9SO4CP Cou4MAdHZU= X-Received: by 2002:a05:600d:6451:10b0:48a:563c:c8c0 with SMTP id 5b1f17b1804b1-4904249d11amr211599515e9.7.1779787215732; Tue, 26 May 2026 02:20:15 -0700 (PDT) Received: from [10.202.80.174] ([202.127.77.110]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c85202a789dsm9286804a12.9.2026.05.26.02.20.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 26 May 2026 02:20:14 -0700 (PDT) Message-ID: <93172f19-9a73-4661-8dad-3dff800c2d54@suse.com> Date: Tue, 26 May 2026 17:20:09 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Thomas Bogendoerfer Cc: akpm@linux-foundation.org, rppt@kernel.org, "Liam R. Howlett" , catalin.marinas@arm.com, jiaxun.yang@flygoat.com, paulburton@kernel.org, linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, ydfan@suse.com From: Yadan Fan Subject: [PATCH v3] MIPS: mm: Fix out-of-bounds write in maar_res_walk() Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From 8dda685e7d0d1653cfb2a93d0865a1fa5a561700 Mon Sep 17 00:00:00 2001 From: Yadan Fan Date: Mon, 25 May 2026 12:04:36 +0800 Subject: [PATCH v3] MIPS: mm: Fix out-of-bounds write in maar_res_walk() 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 --- Changes in v3: - Restore to use WARN_ON() with return -1 to stop walk_system_ram_range() walking further 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 55b25e85122a..1c07ca84ee21 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c @@ -272,9 +272,15 @@ static int maar_res_walk(unsigned long start_pfn, unsi= gned long nr_pages, void *data) { struct maar_walk_info *wi =3D data; - struct maar_config *cfg =3D &wi->cfg[wi->num_cfg]; + struct maar_config *cfg; unsigned int maar_align; =20 + /* Ensure we don't overflow the cfg array */ + if (WARN_ON(wi->num_cfg >=3D ARRAY_SIZE(wi->cfg))) + return -1; + + cfg =3D &wi->cfg[wi->num_cfg]; + /* MAAR registers hold physical addresses right shifted by 4 bits */ maar_align =3D BIT(MIPS_MAAR_ADDR_SHIFT + 4); =20 @@ -283,9 +289,7 @@ static int maar_res_walk(unsigned long start_pfn, unsig= ned long nr_pages, cfg->upper =3D ALIGN_DOWN(PFN_PHYS(start_pfn + nr_pages), maar_align) - 1; cfg->attrs =3D MIPS_MAAR_S; =20 - /* Ensure we don't overflow the cfg array */ - if (!WARN_ON(wi->num_cfg >=3D ARRAY_SIZE(wi->cfg))) - wi->num_cfg++; + wi->num_cfg++; =20 return 0; } --=20 2.51.0