From nobody Tue Apr 7 02:54:57 2026 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) (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 13A6428B7EA for ; Mon, 16 Mar 2026 15:16:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773674209; cv=none; b=OLQyJeDlwQuKj+CRR9ndTqu82MmlnmnAuD1JQcLvlKAzFVdQMJ+oBqzaU5kim2xkXmtH2VQG8ONjVoVrvuNsSw3w+aSG27GO3+b3uY2EMSRWiNVy6ovyO4X7Ibg0E2BoHnBUEa/mK2m+mGrbcCBwDuVbSnpLVLa8pW4RLp6k+FU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773674209; c=relaxed/simple; bh=AYgreJrEMOBolclyn/OmUTGFy0iYyGaUnfeLO4Yf5XY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ULt8K7ZsX/YczO9TmxFyvSQuICmFtd0YPT0nsS5WU+UrgUiskcvPiIFvsb8sfGam9QjTED281n31muLrg29wpxtyScD+p0RCIH6Ik1ZKCaEEGZZnkl7yssiaoEj0jm/5mdbERws2T3vSu7ul7YpaYBWcqOojNYuDzaV+Ip7b7+M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BkRj1vQw; arc=none smtp.client-ip=209.85.221.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BkRj1vQw" Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-43b3cfc38edso2042670f8f.3 for ; Mon, 16 Mar 2026 08:16:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773674206; x=1774279006; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=GVRLeXaP+scdPe7yJ2McKwjwTUisbGcHJ9Hw5wkSV2o=; b=BkRj1vQwT3EXysbwEAufBqOPk0zimzTvFXSYsceOTO9/+PYA6pEHGt4lmPNGYokSJF 51l+58QeSUNIWlVxMZZG/HU+tv8Btaq/dDa1ZwUzPT+khqZiNOrPbutJHYMNoK+z43gE AJfh0djcWXys9J04zwuIwMfR1gCM3pwSxO2n4aF4IpxNR1YZvamdhaL8BbB5EmVtT+eI uKMocNWwY6LIY18sluP0xLykNXgMG94+tf1kDKcYSHldq+zUXEJlTlJY7dRNQG6XfUys 9R29n+C2nEthc67D9IezUz92bu+lzvS5hnJRpQwSmH9woHF8dZy1hI2O2IRwFkYST8hq d9mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773674206; x=1774279006; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=GVRLeXaP+scdPe7yJ2McKwjwTUisbGcHJ9Hw5wkSV2o=; b=Z2yMo/wGoNyixyUBCvGM7aLPxJUNRffHYN5zP2MIF1WCDFnHE4n8eRDtIO+BIC9g+A zAYeUZUAXy1xh5otgDy+Yq6oabfIGJMrdMaCOb+d+hRmSSiih5wV7fa3ILiWGu1tkVXv c4MuxPUeCrwF261wdfD27eA/DJ5uXhYBYzqDUtLKyDwAL1PvyZ6ZNtTL4YPH04BkuEaA qiAiXDYH80SpcTWV2OhHzYQOKxp7qre5Vi4ORPXX55GY0e1F33XhNT0SNpgsbsa9D7qd YGD+PgYhLRzM/KxKuB1lOL5GBOWuazIeICTzD9R137ajlxFSlGFJiFmmoiTN+/1pwd+E QCiw== X-Forwarded-Encrypted: i=1; AJvYcCXYqQgc241jbZiNUMi7ZzYVnO3NR9qkcSJaiiDkbTvTUxI36Hm7jD8Kc+UHG9dSaiZXKLQAJJXkIjM4Y/Q=@vger.kernel.org X-Gm-Message-State: AOJu0YwQ6JmlwZIVPAvOMRbmSJbpDlEIbyM2ei+k/6d0S4xtzrBEy7mS 6IjuksOZtdJ7UzodDldGBdgVGTdG+5qRFH+cpQqoDIJPMmjADhGNciLO X-Gm-Gg: ATEYQzxWR/iAJZNI+fdWmTxZ++c9RB8ca5kMIriTZC8b189Jt9GFDSkTLtq5R169CsD dYnMMAqvgN1iFYr733WaS64QeQIIK+Ev9JqwtFWHMBb8JCSO090/03PyIydfJMNQWswx4mkzyNV 8GRAa6gQQ3xwJyAUioRhjYxvfFgueHJu1iPV+hy77TRjjLcJkWcJ0suXrl7cA0puYyvnrWvaFF3 rUuRAgD1FSYTdkFkwcM3NxQa0BcNMuLVnDY/b+2PjWWNyCM8R5f90n7Phxgw/VDKVpkSiAR320N MILaIxhh4/RcW+sG+zWwOHOL6Gu7GqskX47USDrQ8K1P3DTDg9b5F0X1cMfT5p0k5/zOIy5jDJ2 Dnsz90QcJmg7CzEqmpLHn9I8Y+Y6lyHPWwX+Zdbp4lpCCv4mDEkVZrTWzzhGrJR/pixcUAPadH7 7LJddm/kvTTQEQSMYMw0WROO84kGVVRmatPIrL2uUp8Rqa4eiprQvNCrE9GQ== X-Received: by 2002:a05:6000:4011:b0:43b:4720:10f2 with SMTP id ffacd0b85a97d-43b4720135cmr3807182f8f.43.1773674206375; Mon, 16 Mar 2026 08:16:46 -0700 (PDT) Received: from osama.. ([102.46.166.30]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b457cfa07sm6753634f8f.6.2026.03.16.08.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 08:16:45 -0700 (PDT) From: Osama Abdelkader To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Lorenzo Stoakes , Andrew Morton , Suren Baghdasaryan , "Mike Rapoport (Microsoft)" , Qi Zheng , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Osama Abdelkader , stable@vger.kernel.org Subject: [PATCH v2] riscv: mm: add null check for find_vm_area in __set_memory Date: Mon, 16 Mar 2026 16:16:39 +0100 Message-ID: <20260316151642.13738-1-osama.abdelkader@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" find_vm_area() can return NULL. Add a null check to avoid potential null pointer dereference, matching the pattern used by other arches. Fixes: 311cd2f6e253 ("riscv: Fix set_memory_XX() and set_direct_map_XX() by= splitting huge linear mappings") Cc: stable@vger.kernel.org Signed-off-by: Osama Abdelkader --- v2: - Add Cc: stable@vger.kernel.org - Add Fixes: tag - mention __set_memory in the commit message --- arch/riscv/mm/pageattr.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/riscv/mm/pageattr.c b/arch/riscv/mm/pageattr.c index 3f76db3d2769..46a999c86b26 100644 --- a/arch/riscv/mm/pageattr.c +++ b/arch/riscv/mm/pageattr.c @@ -289,6 +289,10 @@ static int __set_memory(unsigned long addr, int numpag= es, pgprot_t set_mask, int i, page_start; =20 area =3D find_vm_area((void *)start); + if (!area) { + ret =3D -EINVAL; + goto unlock; + } page_start =3D (start - (unsigned long)area->addr) >> PAGE_SHIFT; =20 for (i =3D page_start; i < page_start + numpages; ++i) { --=20 2.43.0