]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
x86/kaslr: Fix process_efi_entries comment
authorArvind Sankar <nivedita@alum.mit.edu>
Mon, 27 Jul 2020 23:07:56 +0000 (19:07 -0400)
committerIngo Molnar <mingo@kernel.org>
Fri, 31 Jul 2020 09:08:12 +0000 (11:08 +0200)
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@alum.mit.edu>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20200727230801.3468620-4-nivedita@alum.mit.edu
arch/x86/boot/compressed/kaslr.c

index c31f3a5ab9e40f6572430dad370f9bfd96840049..1ab67a84a78137d51b3c23cf906fd7b0537c2530 100644 (file)
@@ -742,8 +742,8 @@ static bool process_mem_region(struct mem_vector *region,
 
 #ifdef CONFIG_EFI
 /*
- * 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)