This is a note to let you know that I've just added the patch titled
efi: stub: omit SetVirtualAddressMap() if marked unsupported in RT_PROP table
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
efi-stub-omit-setvirtualaddressmap-if-marked-unsupported-in-rt_prop-table.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 9e9888a0fe97b9501a40f717225d2bef7100a2c1 Mon Sep 17 00:00:00 2001
From: Ard Biesheuvel <ardb@xxxxxxxxxx>
Date: Fri, 5 Mar 2021 10:21:05 +0100
Subject: efi: stub: omit SetVirtualAddressMap() if marked unsupported in RT_PROP table
From: Ard Biesheuvel <ardb@xxxxxxxxxx>
commit 9e9888a0fe97b9501a40f717225d2bef7100a2c1 upstream.
The EFI_RT_PROPERTIES_TABLE contains a mask of runtime services that are
available after ExitBootServices(). This mostly does not concern the EFI
stub at all, given that it runs before that. However, there is one call
that is made at runtime, which is the call to SetVirtualAddressMap()
(which is not even callable at boot time to begin with)
So add the missing handling of the RT_PROP table to ensure that we only
call SetVirtualAddressMap() if it is not being advertised as unsupported
by the firmware.
Cc: <stable@xxxxxxxxxxxxxxx> # v5.10+
Tested-by: Shawn Guo <shawn.guo@xxxxxxxxxx>
Signed-off-by: Ard Biesheuvel <ardb@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/firmware/efi/libstub/efi-stub.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
--- a/drivers/firmware/efi/libstub/efi-stub.c
+++ b/drivers/firmware/efi/libstub/efi-stub.c
@@ -96,6 +96,18 @@ static void install_memreserve_table(voi
efi_err("Failed to install memreserve config table!\n");
}
+static u32 get_supported_rt_services(void)
+{
+ const efi_rt_properties_table_t *rt_prop_table;
+ u32 supported = EFI_RT_SUPPORTED_ALL;
+
+ rt_prop_table = get_efi_config_table(EFI_RT_PROPERTIES_TABLE_GUID);
+ if (rt_prop_table)
+ supported &= rt_prop_table->runtime_services_supported;
+
+ return supported;
+}
+
/*
* EFI entry point for the arm/arm64 EFI stubs. This is the entrypoint
* that is described in the PE/COFF header. Most of the code is the same
@@ -250,6 +262,10 @@ efi_status_t __efiapi efi_pe_entry(efi_h
(prop_tbl->memory_protection_attribute &
EFI_PROPERTIES_RUNTIME_MEMORY_PROTECTION_NON_EXECUTABLE_PE_DATA);
+ /* force efi_novamap if SetVirtualAddressMap() is unsupported */
+ efi_novamap |= !(get_supported_rt_services() &
+ EFI_RT_SUPPORTED_SET_VIRTUAL_ADDRESS_MAP);
+
/* hibernation expects the runtime regions to stay in the same place */
if (!IS_ENABLED(CONFIG_HIBERNATION) && !efi_nokaslr && !flat_va_mapping) {
/*
Patches currently in stable-queue which might be from ardb@xxxxxxxxxx are
queue-5.10/arm64-mm-use-a-48-bit-id-map-when-possible-on-52-bit.patch
queue-5.10/efi-stub-omit-setvirtualaddressmap-if-marked-unsupported-in-rt_prop-table.patch
queue-5.10/arm-9029-1-make-iwmmxt.s-support-clang-s-integrated-.patch
queue-5.10/arm-efistub-replace-adrl-pseudo-op-with-adr_l-macro-.patch
queue-5.10/arm64-mm-fix-pfn_valid-for-zone_device-based-memory.patch
queue-5.10/arm-assembler-introduce-adr_l-ldr_l-and-str_l-macros.patch
