Skip to content

Commit 48a4282

Browse files
huthardbiesheuvel
authored andcommitted
efi/capsule-loader: fix incorrect sizeof in phys array reallocation
The krealloc() call for cap_info->phys in __efi_capsule_setup_info() uses sizeof(phys_addr_t *) instead of sizeof(phys_addr_t), which might be causing an undersized allocation. The allocation is also inconsistent with the initial array allocation in efi_capsule_open() that allocates one entry with sizeof(phys_addr_t), and the efi_capsule_write() function that stores phys_addr_t values (not pointers) via page_to_phys(). On 64-bit systems where sizeof(phys_addr_t) == sizeof(phys_addr_t *), this goes unnoticed. On 32-bit systems with PAE where phys_addr_t is 64-bit but pointers are 32-bit, this allocates half the required space, which might lead to a heap buffer overflow when storing physical addresses. This is similar to the bug fixed in commit fccfa64 ("efi/capsule-loader: fix incorrect allocation size") which fixed the same issue at the initial allocation site. Fixes: f24c4d4 ("efi/capsule-loader: Reinstate virtual capsule mapping") Assisted-by: Claude:claude-sonnet-4-5 Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
1 parent 259e3e6 commit 48a4282

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/firmware/efi/capsule-loader.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ int __efi_capsule_setup_info(struct capsule_info *cap_info)
6767
cap_info->pages = temp_page;
6868

6969
temp_page = krealloc(cap_info->phys,
70-
pages_needed * sizeof(phys_addr_t *),
70+
pages_needed * sizeof(phys_addr_t),
7171
GFP_KERNEL | __GFP_ZERO);
7272
if (!temp_page)
7373
return -ENOMEM;

0 commit comments

Comments
 (0)