]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
efi/capsule-loader: fix incorrect sizeof in phys array reallocation
authorThomas Huth <thuth@redhat.com>
Fri, 10 Apr 2026 15:46:37 +0000 (17:46 +0200)
committerArd Biesheuvel <ardb@kernel.org>
Fri, 10 Apr 2026 16:14:21 +0000 (18:14 +0200)
commit48a428215782321b56956974f23593e40ce84b7a
treeec99580a6e636cddffd1cd3359f6105203532390
parent259e3e6f9382b6a9fe570313d97c59a233f7d72f
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 fccfa646ef36 ("efi/capsule-loader:
fix incorrect allocation size") which fixed the same issue at the initial
allocation site.

Fixes: f24c4d478013 ("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>
drivers/firmware/efi/capsule-loader.c