lkml.org 
[lkml]   [2014]   [Aug]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 3/5] efi arm64: do not enter virtual mode in case booting with efi=noruntime or noefi
Date
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@redhat.com>
---
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


\
 
 \ /
  Last update: 2014-08-12 08:21    [W:0.120 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site