* [PATCH for-stable] efi: libstub: drop pointless get_memory_map() call
@ 2022-10-18 18:25 Ard Biesheuvel
2022-10-19 6:54 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Ard Biesheuvel @ 2022-10-18 18:25 UTC (permalink / raw)
To: linux-efi; +Cc: Ard Biesheuvel, stable
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: <stable@vger.kernel.org> # v4.14+
Fixes: 24d7c494ce46 ("efi/arm-stub: Round up FDT allocation to mapping size")
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
drivers/firmware/efi/libstub/fdt.c | 8 --------
1 file changed, 8 deletions(-)
This is a backport for v5.4 and older, where the patch in question did
not apply cleanly on the first attempt. Please apply.
diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c
index dba296a44f4e..2a1a587edef9 100644
--- 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_boot(efi_system_table_t *sys_table,
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);
--
2.35.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH for-stable] efi: libstub: drop pointless get_memory_map() call
2022-10-18 18:25 [PATCH for-stable] efi: libstub: drop pointless get_memory_map() call Ard Biesheuvel
@ 2022-10-19 6:54 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2022-10-19 6:54 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: linux-efi, stable
On Tue, Oct 18, 2022 at 08:25:45PM +0200, Ard Biesheuvel wrote:
> 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: <stable@vger.kernel.org> # v4.14+
> Fixes: 24d7c494ce46 ("efi/arm-stub: Round up FDT allocation to mapping size")
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
> drivers/firmware/efi/libstub/fdt.c | 8 --------
> 1 file changed, 8 deletions(-)
>
> This is a backport for v5.4 and older, where the patch in question did
> not apply cleanly on the first attempt. Please apply.
Thanks, now queued up.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-19 6:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-18 18:25 [PATCH for-stable] efi: libstub: drop pointless get_memory_map() call Ard Biesheuvel
2022-10-19 6:54 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).