From 94f6a82dfadb2c619d2245daa27d8141b3cd6d53 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 19 Oct 2022 08:57:44 +0200 Subject: [PATCH] 4.14-stable patches added patches: efi-libstub-drop-pointless-get_memory_map-call.patch --- ...b-drop-pointless-get_memory_map-call.patch | 37 +++++++++++++++++++ queue-4.14/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 queue-4.14/efi-libstub-drop-pointless-get_memory_map-call.patch diff --git a/queue-4.14/efi-libstub-drop-pointless-get_memory_map-call.patch b/queue-4.14/efi-libstub-drop-pointless-get_memory_map-call.patch new file mode 100644 index 00000000000..d2f10fea057 --- /dev/null +++ b/queue-4.14/efi-libstub-drop-pointless-get_memory_map-call.patch @@ -0,0 +1,37 @@ +From d80ca810f096ff66f451e7a3ed2f0cd9ef1ff519 Mon Sep 17 00:00:00 2001 +From: Ard Biesheuvel +Date: Thu, 15 Sep 2022 19:00:24 +0200 +Subject: efi: libstub: drop pointless get_memory_map() call + +From: Ard Biesheuvel + +commit d80ca810f096ff66f451e7a3ed2f0cd9ef1ff519 upstream. + +Currently, the non-x86 stub code calls get_memory_map() redundantly, +given that the data it returns is never used anywhere. So drop the call. + +Cc: # v4.14+ +Fixes: 24d7c494ce46 ("efi/arm-stub: Round up FDT allocation to mapping size") +Signed-off-by: Ard Biesheuvel +Signed-off-by: Greg Kroah-Hartman +--- + drivers/firmware/efi/libstub/fdt.c | 8 -------- + 1 file changed, 8 deletions(-) + +--- a/drivers/firmware/efi/libstub/fdt.c ++++ b/drivers/firmware/efi/libstub/fdt.c +@@ -301,14 +301,6 @@ efi_status_t allocate_new_fdt_and_exit_b + goto fail; + } + +- /* +- * Now that we have done our final memory allocation (and free) +- * we can get the memory map key needed for exit_boot_services(). +- */ +- status = efi_get_memory_map(sys_table, &map); +- if (status != EFI_SUCCESS) +- goto fail_free_new_fdt; +- + status = update_fdt(sys_table, (void *)fdt_addr, fdt_size, + (void *)*new_fdt_addr, MAX_FDT_SIZE, cmdline_ptr, + initrd_addr, initrd_size); diff --git a/queue-4.14/series b/queue-4.14/series index 2af41b6f32a..d72d766c87d 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -209,3 +209,4 @@ net-ieee802154-return-einval-for-unknown-addr-type.patch net-ieee802154-don-t-warn-zero-sized-raw_sendmsg.patch ext4-continue-to-expand-file-system-when-the-target-size-doesn-t-reach.patch md-replace-snprintf-with-scnprintf.patch +efi-libstub-drop-pointless-get_memory_map-call.patch -- 2.47.3