linux-kernel - [tip:efi/core] efi: Process the MEMATTR table only if EFI

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-457ea3f7e97881f937136ce0ba1f29f82b9abdb0@git.kernel.org>
Date:   Fri, 23 Jun 2017 07:02:43 -0700
From:   tip-bot for Daniel Kiper <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     mingo@...nel.org, peterz@...radead.org, tglx@...utronix.de,
        ard.biesheuvel@...aro.org, torvalds@...ux-foundation.org,
        daniel.kiper@...cle.com, hpa@...or.com,
        linux-kernel@...r.kernel.org
Subject: [tip:efi/core] efi: Process the MEMATTR table only if EFI_MEMMAP is
 enabled

Commit-ID:  457ea3f7e97881f937136ce0ba1f29f82b9abdb0
Gitweb:     http://git.kernel.org/tip/457ea3f7e97881f937136ce0ba1f29f82b9abdb0
Author:     Daniel Kiper <daniel.kiper@...cle.com>
AuthorDate: Thu, 22 Jun 2017 12:51:36 +0200
Committer:  Ingo Molnar <mingo@...nel.org>
CommitDate: Fri, 23 Jun 2017 11:11:02 +0200

efi: Process the MEMATTR table only if EFI_MEMMAP is enabled

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

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

Signed-off-by: Daniel Kiper <daniel.kiper@...cle.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@...aro.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: andrew.cooper3@...rix.com
Cc: boris.ostrovsky@...cle.com
Cc: jgross@...e.com
Cc: linux-efi@...r.kernel.org
Cc: matt@...eblueprint.co.uk
Cc: stable@...r.kernel.org
Cc: xen-devel@...ts.xenproject.org
Link: http://lkml.kernel.org/r/1498128697-12943-2-git-send-email-daniel.kiper@oracle.com
Signed-off-by: Ingo Molnar <mingo@...nel.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) {