[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20170719100826.557422162@linuxfoundation.org>
Date: Wed, 19 Jul 2017 12:08:00 +0200
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org, Daniel Kiper <daniel.kiper@...cle.com>,
Ard Biesheuvel <ard.biesheuvel@...aro.org>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Peter Zijlstra <peterz@...radead.org>,
Thomas Gleixner <tglx@...utronix.de>,
andrew.cooper3@...rix.com, boris.ostrovsky@...cle.com,
jgross@...e.com, linux-efi@...r.kernel.org,
matt@...eblueprint.co.uk, xen-devel@...ts.xenproject.org,
Ingo Molnar <mingo@...nel.org>
Subject: [PATCH 4.11 38/88] efi: Process the MEMATTR table only if EFI_MEMMAP is enabled
4.11-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Kiper <daniel.kiper@...cle.com>
commit 457ea3f7e97881f937136ce0ba1f29f82b9abdb0 upstream.
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: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
drivers/firmware/efi/efi.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -528,7 +528,8 @@ int __init efi_config_parse_tables(void
}
}
- 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) {
Powered by blists - more mailing lists