From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Andrew Bresticker <abrestic@rivosinc.com>,
Ard Biesheuvel <ardb@kernel.org>, Sasha Levin <sashal@kernel.org>,
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.1 15/28] efi: runtime: Fix potential overflow of soft-reserved region size
Date: Mon, 12 Feb 2024 19:22:13 -0500 [thread overview]
Message-ID: <20240213002235.671934-15-sashal@kernel.org> (raw)
In-Reply-To: <20240213002235.671934-1-sashal@kernel.org>
From: Andrew Bresticker <abrestic@rivosinc.com>
[ 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 <abrestic@rivosinc.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 7c48c380d722..1995f0a2e0fc 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 d0daacd2c903..6b142aa35389 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
next prev parent reply other threads:[~2024-02-13 0:22 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-13 0:21 [PATCH AUTOSEL 6.1 01/28] fs/ntfs3: Modified fix directory element type detection Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 02/28] fs/ntfs3: Improve ntfs_dir_count Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 03/28] fs/ntfs3: Correct hard links updating when dealing with DOS names Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 04/28] fs/ntfs3: Print warning while fixing hard links count Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 05/28] fs/ntfs3: Fix detected field-spanning write (size 8) of single field "le->name" Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 06/28] fs/ntfs3: Add NULL ptr dereference checking at the end of attr_allocate_frame() Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 07/28] fs/ntfs3: Disable ATTR_LIST_ENTRY size check Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 08/28] fs/ntfs3: use non-movable memory for ntfs3 MFT buffer cache Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 09/28] fs/ntfs3: Prevent generic message "attempt to access beyond end of device" Sasha Levin
2024-02-18 18:00 ` Pavel Machek
2024-02-18 18:06 ` Greg KH
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 10/28] fs/ntfs3: Correct function is_rst_area_valid Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 11/28] fs/ntfs3: Update inode->i_size after success write into compressed file Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 12/28] fs/ntfs3: Fix oob in ntfs_listxattr Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 13/28] wifi: mac80211: set station RX-NSS on reconfig Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 14/28] wifi: mac80211: adding missing drv_mgd_complete_tx() call Sasha Levin
2024-02-13 0:22 ` Sasha Levin [this message]
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 16/28] efi: Don't add memblocks for soft-reserved memory Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 17/28] hwmon: (coretemp) Enlarge per package core count limit Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 18/28] scsi: lpfc: Use unsigned type for num_sge Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 19/28] scsi: ufs: core: Remove the ufshcd_release() in ufshcd_err_handling_prepare() Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 20/28] LoongArch: Select ARCH_ENABLE_THP_MIGRATION instead of redefining it Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 21/28] LoongArch: Select HAVE_ARCH_SECCOMP to use the common SECCOMP menu Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 22/28] firewire: core: send bus reset promptly on gap count error Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 23/28] PCI: dwc: Clean up dw_pcie_ep_raise_msi_irq() alignment Sasha Levin
2024-02-18 18:01 ` Pavel Machek
2024-02-21 18:53 ` Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 24/28] drm/amdgpu: skip to program GFXDEC registers for suspend abort Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 25/28] drm/amdgpu: reset gpu for s3 suspend abort case Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 26/28] smb: client: set correct d_type for reparse points under DFS mounts Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 27/28] virtio-blk: Ensure no requests in virtqueues before deleting vqs Sasha Levin
2024-02-13 0:22 ` [PATCH AUTOSEL 6.1 28/28] smb3: clarify mount warning Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240213002235.671934-15-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=abrestic@rivosinc.com \
--cc=aou@eecs.berkeley.edu \
--cc=ardb@kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox