From 42cc1d8e205be238b018eb3cf2d99646eb007d8e Mon Sep 17 00:00:00 2001 From: mintsuki Date: Fri, 7 Oct 2022 07:49:47 +0200 Subject: [PATCH] misc: Dynamically allocate EFI memmap copy --- common/lib/misc.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/common/lib/misc.c b/common/lib/misc.c index d2c88568..f9c3bd00 100644 --- a/common/lib/misc.c +++ b/common/lib/misc.c @@ -111,8 +111,6 @@ uint32_t hex2bin(uint8_t *str, uint32_t size) { no_unwind bool efi_boot_services_exited = false; -#define EFI_COPY_MAX_ENTRIES 2048 - bool efi_exit_boot_services(void) { EFI_STATUS status; @@ -134,6 +132,14 @@ bool efi_exit_boot_services(void) { goto fail; } + EFI_MEMORY_DESCRIPTOR *efi_copy; + status = gBS->AllocatePool(EfiLoaderData, efi_mmap_size * 2, (void **)&efi_copy); + if (status) { + goto fail; + } + + const size_t EFI_COPY_MAX_ENTRIES = (efi_mmap_size * 2) / efi_desc_size; + size_t retries = 0; retry: @@ -163,7 +169,6 @@ retry: // Go through new EFI memmap and free up bootloader entries size_t entry_count = efi_mmap_size / efi_desc_size; - EFI_MEMORY_DESCRIPTOR *efi_copy = ext_mem_alloc(EFI_COPY_MAX_ENTRIES * efi_desc_size); size_t efi_copy_i = 0; for (size_t i = 0; i < entry_count; i++) {