linux-kernel - [PATCH 3/8] efi: modify EFI stub code for arm/arm64

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>] [day] [month] [year] [list]

Message-Id: <1538067339-5826-1-git-send-email-maksym.kokhan@globallogic.com>
Date:   Thu, 27 Sep 2018 19:55:39 +0300
From:   Maksym Kokhan <maksym.kokhan@...ballogic.com>
To:     Ard Biesheuvel <ard.biesheuvel@...aro.org>,
        Russell King <linux@...linux.org.uk>,
        Catalin Marinas <catalin.marinas@....com>,
        Will Deacon <will.deacon@....com>
Cc:     Daniel Walker <dwalker@...o99.com>,
        Daniel Walker <danielwa@...co.com>,
        Andrii Bordunov <aborduno@...co.com>,
        Ruslan Bilovol <rbilovol@...co.com>, linux-efi@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: [PATCH 3/8] efi: modify EFI stub code for arm/arm64

Original EFI stub code parses command line, using old configs: CMDLINE,
CMDLINE_EXTEND and CMDLINE_FORCE. New generic builtin command line use
new configs: CMDLINE_PREPEND, CMDLINE_APPEND and CMDLINE_OVERRIDE, which
depend on CMDLINE_BOOL.

Cc: Daniel Walker <dwalker@...o99.com>
Cc: Daniel Walker <danielwa@...co.com>
Signed-off-by: Maksym Kokhan <maksym.kokhan@...ballogic.com>
---
 drivers/firmware/efi/libstub/arm-stub.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/firmware/efi/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c
index 6920033..40396e1 100644
--- a/drivers/firmware/efi/libstub/arm-stub.c
+++ b/drivers/firmware/efi/libstub/arm-stub.c
@@ -146,12 +146,12 @@ unsigned long efi_entry(void *handle, efi_system_table_t *sys_table,
 		goto fail;
 	}
 
-	if (IS_ENABLED(CONFIG_CMDLINE_EXTEND) ||
-	    IS_ENABLED(CONFIG_CMDLINE_FORCE) ||
-	    cmdline_size == 0)
-		efi_parse_options(CONFIG_CMDLINE);
+	#if IS_ENABLED(CONFIG_CMDLINE_BOOL)
+		efi_parse_options(CONFIG_CMDLINE_PREPEND);
+		efi_parse_options(CONFIG_CMDLINE_APPEND);
+	#endif
 
-	if (!IS_ENABLED(CONFIG_CMDLINE_FORCE) && cmdline_size > 0)
+	if (!IS_ENABLED(CONFIG_CMDLINE_OVERRIDE) && cmdline_size > 0)
 		efi_parse_options(cmdline_ptr);
 
 	pr_efi(sys_table, "Booting Linux Kernel...\n");
-- 
2.7.4