[tip: x86/kaslr] x86/kaslr: Fix process_efi_entries comment

From: tip-bot2 for Arvind Sankar
Date: Tue Jul 28 2020 - 08:29:29 EST

The following commit has been merged into the x86/kaslr branch of tip:

Commit-ID: a68bcea591a040cce5e08615c829a316beb3e4b4
Gitweb: https://git.kernel.org/tip/a68bcea591a040cce5e08615c829a316beb3e4b4
Author: Arvind Sankar <nivedita@xxxxxxxxxxxx>
AuthorDate: Mon, 27 Jul 2020 19:07:56 -04:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Tue, 28 Jul 2020 12:54:43 +02:00

x86/kaslr: Fix process_efi_entries comment

Since commit:

0982adc74673 ("x86/boot/KASLR: Work around firmware bugs by excluding EFI_BOOT_SERVICES_* and EFI_LOADER_* from KASLR's choice")

process_efi_entries() will return true if we have an EFI memmap, not just
if it contained EFI_MEMORY_MORE_RELIABLE regions.

Signed-off-by: Arvind Sankar <nivedita@xxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20200727230801.3468620-4-nivedita@xxxxxxxxxxxx
arch/x86/boot/compressed/kaslr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c
index 21cd9e0..207fcb7 100644
--- a/arch/x86/boot/compressed/kaslr.c
+++ b/arch/x86/boot/compressed/kaslr.c
@@ -741,8 +741,8 @@ static bool process_mem_region(struct mem_vector *region,

- * Returns true if mirror region found (and must have been processed
- * for slots adding)
+ * Returns true if we processed the EFI memmap, which we prefer over the E820
+ * table if it is available.
static bool
process_efi_entries(unsigned long minimum, unsigned long image_size)