Skip to content

Commit de1034b

Browse files
abrestic-rivosardbiesheuvel
authored andcommitted
efi: runtime: Fix potential overflow of soft-reserved region size
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>
1 parent aa0e784 commit de1034b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/firmware/efi/arm-runtime.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ static int __init arm_enable_runtime_services(void)
107107
efi_memory_desc_t *md;
108108

109109
for_each_efi_memory_desc(md) {
110-
int md_size = md->num_pages << EFI_PAGE_SHIFT;
110+
u64 md_size = md->num_pages << EFI_PAGE_SHIFT;
111111
struct resource *res;
112112

113113
if (!(md->attribute & EFI_MEMORY_SP))

drivers/firmware/efi/riscv-runtime.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static int __init riscv_enable_runtime_services(void)
8585
efi_memory_desc_t *md;
8686

8787
for_each_efi_memory_desc(md) {
88-
int md_size = md->num_pages << EFI_PAGE_SHIFT;
88+
u64 md_size = md->num_pages << EFI_PAGE_SHIFT;
8989
struct resource *res;
9090

9191
if (!(md->attribute & EFI_MEMORY_SP))

0 commit comments

Comments
 (0)