In case efi runtime disabled via noefi kernel cmdline arm64_enter_virtual_mode
should error out.
At the same time move early_memunmap(memmap.map, mapsize) to the beginning of
the function or it will leak early mem.
Signed-off-by: Dave Young <dyoung@xxxxxxxxxx>
---
arch/arm64/kernel/efi.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
index e72f310..324cdd1 100644
--- a/arch/arm64/kernel/efi.c
+++ b/arch/arm64/kernel/efi.c
@@ -386,7 +386,10 @@ static int __init arm64_enter_virtual_mode(void)
int count = 0;
unsigned long flags;
- if (!efi_enabled(EFI_BOOT)) {
+ mapsize = memmap.map_end - memmap.map;
+ early_memunmap(memmap.map, mapsize);
+
+ if (!efi_enabled(EFI_BOOT) || efi_runtime_disabled()) {
pr_info("EFI services will not be available.\n");
return -1;
}
@@ -394,8 +397,6 @@ static int __init arm64_enter_virtual_mode(void)
pr_info("Remapping and enabling EFI services.\n");
/* replace early memmap mapping with permanent mapping */
- mapsize = memmap.map_end - memmap.map;
- early_memunmap(memmap.map, mapsize);
memmap.map = (__force void *)ioremap_cache((phys_addr_t)memmap.phys_map,
mapsize);
memmap.map_end = memmap.map + mapsize;
--
1.8.3.1
--
To unsubscribe from this list: send the line "unsubscribe linux-efi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
