From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8FAB46167B; Tue, 13 Feb 2024 00:21:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707783687; cv=none; b=tNumlXd5uebwUZDw0iSK9KqMXq/8kGcEKDOT73D+Q/DXiMOUvYI0vmmJMH/tTwXuIgC+m44DpOQO0XqPIJPuy4AZJ2zBb190FBhrQvturas0enKPi5uApnN60Lh1drJqjMFbzgcR+myTSYTtncEfnaqjdVME/3GoJIJlIK5yH9w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707783687; c=relaxed/simple; bh=coe5qCrIxtjBe9bpwxvduhBiOdnr8HhwgkBSSur6uTU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fdta+W0Ni1DdOBpfdVjE4GoVb1Qff8pwAQ29OHMQNpsxOR8xNFPfZA/s4CIs41dfDpD4CX3UQHnA/KZ0TZrxGOHARxf3glpITxsLQASHl0DioUBdkjKl5C7LwOpz6zCY5IOPbFfJjoPJnlxvZonEOKSdDwzbadC3mst+Pq34dH0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KzYd2o8n; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KzYd2o8n" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 398F2C43394; Tue, 13 Feb 2024 00:21:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707783687; bh=coe5qCrIxtjBe9bpwxvduhBiOdnr8HhwgkBSSur6uTU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KzYd2o8nds3S1FFKKVXQiKFklssHfcDpIb5Nq9P/Se0cqtZcTpK0N3mwwLKEFnK36 gUA97G6A9zh4eODxshwYdXBdLFy/wb5lFP+z7Z9NZwkjlh/5E8tA/suQcVn9dsBDhz PTEeAkbf7Bd83h2ja7mERKwBrPdRgm2BFSn9S3lI5sxc8jtkvgRGZ6Irn8diUrWDBY RcbaMYaB44pBB2EY4wLuRb5/jszAxO6F3Aq0WGFLlSo1gwmk7RFwDWvwH3EmqXgE5d ic2XpaYfAO17eJRENbq14KzFwcA9jPx/6ZB5+Zw5N/cle52fyunZThA8fo6fmMIBbz 0Pimoq1nvy7Vg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andrew Bresticker , Ard Biesheuvel , Sasha Levin , paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, linux-efi@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH AUTOSEL 6.6 27/51] efi: runtime: Fix potential overflow of soft-reserved region size Date: Mon, 12 Feb 2024 19:20:04 -0500 Message-ID: <20240213002052.670571-27-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213002052.670571-1-sashal@kernel.org> References: <20240213002052.670571-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.16 Content-Transfer-Encoding: 8bit From: Andrew Bresticker [ Upstream commit de1034b38a346ef6be25fe8792f5d1e0684d5ff4 ] md_size will have been narrowed if we have >= 4GB worth of pages in a soft-reserved region. Signed-off-by: Andrew Bresticker Signed-off-by: Ard Biesheuvel Signed-off-by: Sasha Levin --- drivers/firmware/efi/arm-runtime.c | 2 +- drivers/firmware/efi/riscv-runtime.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c index 83f5bb57fa4c..83092d93f36a 100644 --- a/drivers/firmware/efi/arm-runtime.c +++ b/drivers/firmware/efi/arm-runtime.c @@ -107,7 +107,7 @@ static int __init arm_enable_runtime_services(void) efi_memory_desc_t *md; for_each_efi_memory_desc(md) { - int md_size = md->num_pages << EFI_PAGE_SHIFT; + u64 md_size = md->num_pages << EFI_PAGE_SHIFT; struct resource *res; if (!(md->attribute & EFI_MEMORY_SP)) diff --git a/drivers/firmware/efi/riscv-runtime.c b/drivers/firmware/efi/riscv-runtime.c index 09525fb5c240..01f0f90ea418 100644 --- a/drivers/firmware/efi/riscv-runtime.c +++ b/drivers/firmware/efi/riscv-runtime.c @@ -85,7 +85,7 @@ static int __init riscv_enable_runtime_services(void) efi_memory_desc_t *md; for_each_efi_memory_desc(md) { - int md_size = md->num_pages << EFI_PAGE_SHIFT; + u64 md_size = md->num_pages << EFI_PAGE_SHIFT; struct resource *res; if (!(md->attribute & EFI_MEMORY_SP)) -- 2.43.0