linux-kernel - [tip:efi/core] x86/efi: Fix kernel param add_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 for Android: free password hash cracker in your pocket

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

Message-ID: <tip-835bcec5fdf3f9e880111b482177e7e70e3596da@git.kernel.org>
Date:   Wed, 3 Jan 2018 08:17:43 -0800
From:   tip-bot for Dave Young <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     dyoung@...hat.com, mingo@...nel.org, hpa@...or.com,
        ge.song@...-semitech.com, torvalds@...ux-foundation.org,
        peterz@...radead.org, tglx@...utronix.de, matt@...eblueprint.co.uk,
        pure.logic@...us-software.ie, ard.biesheuvel@...aro.org,
        linux-kernel@...r.kernel.org
Subject: [tip:efi/core] x86/efi: Fix kernel param add_efi_memmap regression

Commit-ID:  835bcec5fdf3f9e880111b482177e7e70e3596da
Gitweb:     https://git.kernel.org/tip/835bcec5fdf3f9e880111b482177e7e70e3596da
Author:     Dave Young <dyoung@...hat.com>
AuthorDate: Tue, 2 Jan 2018 17:21:09 +0000
Committer:  Ingo Molnar <mingo@...nel.org>
CommitDate: Wed, 3 Jan 2018 13:54:31 +0100

x86/efi: Fix kernel param add_efi_memmap regression

'add_efi_memmap' is an early param, but do_add_efi_memmap() has no
chance to run because the code path is before parse_early_param().
I believe it worked when the param was introduced but probably later
some other changes caused the wrong order and nobody noticed it.

Move efi_memblock_x86_reserve_range() after parse_early_param()
to fix it.

Signed-off-by: Dave Young <dyoung@...hat.com>
Signed-off-by: Matt Fleming <matt@...eblueprint.co.uk>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@...aro.org>
Cc: Bryan O'Donoghue <pure.logic@...us-software.ie>
Cc: Ge Song <ge.song@...-semitech.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: linux-efi@...r.kernel.org
Link: http://lkml.kernel.org/r/20180102172110.17018-2-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 arch/x86/kernel/setup.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 8af2e8d..145810b 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -906,9 +906,6 @@ void __init setup_arch(char **cmdline_p)
 		set_bit(EFI_BOOT, &efi.flags);
 		set_bit(EFI_64BIT, &efi.flags);
 	}
-
-	if (efi_enabled(EFI_BOOT))
-		efi_memblock_x86_reserve_range();
 #endif
 
 	x86_init.oem.arch_setup();
@@ -962,6 +959,8 @@ void __init setup_arch(char **cmdline_p)
 
 	parse_early_param();
 
+	if (efi_enabled(EFI_BOOT))
+		efi_memblock_x86_reserve_range();
 #ifdef CONFIG_MEMORY_HOTPLUG
 	/*
 	 * Memory used by the kernel cannot be hot-removed because Linux