diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-24 13:54:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-24 13:54:06 -0700 |
| commit | ab8de2dbfc9ec912f2762f3b813437a4c4f56251 (patch) | |
| tree | ede5d2cdc56320d4047beb06d51472a36d56bda9 /drivers/firmware/efi/libstub/randomalloc.c | |
| parent | 5e74df2f8f15eaa1ebbdfc1f6fef27a26d789de8 (diff) | |
| parent | 62b71cd73d41ddac6b1760402bbe8c4932e23531 (diff) | |
| download | linux-ab8de2dbfc9ec912f2762f3b813437a4c4f56251.tar.gz | |
Merge tag 'efi-fixes-for-v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi
Pull EFI fixes from Ard Biesheuvel:
- Fix logic that is supposed to prevent placement of the kernel image
below LOAD_PHYSICAL_ADDR
- Use the firmware stack in the EFI stub when running in mixed mode
- Clear BSS only once when using mixed mode
- Check efi.get_variable() function pointer for NULL before trying to
call it
* tag 'efi-fixes-for-v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
efi: fix panic in kdump kernel
x86/efistub: Don't clear BSS twice in mixed mode
x86/efistub: Call mixed mode boot services on the firmware's stack
efi/libstub: fix efi_random_alloc() to allocate memory at alloc_min or higher address
Diffstat (limited to 'drivers/firmware/efi/libstub/randomalloc.c')
| -rw-r--r-- | drivers/firmware/efi/libstub/randomalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efi/libstub/randomalloc.c b/drivers/firmware/efi/libstub/randomalloc.c index 4e96a855fdf47b..7e185285955021 100644 --- a/drivers/firmware/efi/libstub/randomalloc.c +++ b/drivers/firmware/efi/libstub/randomalloc.c @@ -120,7 +120,7 @@ efi_status_t efi_random_alloc(unsigned long size, continue; } - target = round_up(md->phys_addr, align) + target_slot * align; + target = round_up(max(md->phys_addr, alloc_min), align) + target_slot * align; pages = size / EFI_PAGE_SIZE; status = efi_bs_call(allocate_pages, EFI_ALLOCATE_ADDRESS, |