[PATCH v2 1/2] efi: Process MEMATTR table only if EFI_MEMMAP

From	Daniel Kiper <daniel.kiper@oracle.com>
Newsgroups	linux.kernel
Subject	[PATCH v2 1/2] efi: Process MEMATTR table only if EFI_MEMMAP
Date	2017-06-22 13:00 +0200
Message-ID	<tV809-3zb-1@gated-at.bofh.it> (permalink)
References	<tV809-3zb-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Otherwise e.g. Xen dom0 on x86_64 EFI platforms crashes.

In theory we can check EFI_PARAVIRT too, however,
EFI_MEMMAP looks more generic and covers more cases.

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 drivers/firmware/efi/efi.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index b372aad..045d6d3 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -528,7 +528,8 @@ int __init efi_config_parse_tables(void *config_tables, int count, int sz,
 		}
 	}
 
-	efi_memattr_init();
+	if (efi_enabled(EFI_MEMMAP))
+		efi_memattr_init();
 
 	/* Parse the EFI Properties table if it exists */
 	if (efi.properties_table != EFI_INVALID_TABLE_ADDR) {
-- 
1.7.10.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 1/2] efi: Process MEMATTR table only if EFI_MEMMAP Daniel Kiper <daniel.kiper@oracle.com> - 2017-06-22 13:00 +0200
  [tip:efi/core] efi: Process the MEMATTR table only if EFI_MEMMAP is  enabled tip-bot for Daniel Kiper <tipbot@zytor.com> - 2017-06-23 16:10 +0200

csiph-web