[PATCH 5.8 145/148] efi/libstub: Stop parsing arguments at "--"

From: Greg Kroah-Hartman
Date: Mon Aug 24 2020 - 04:38:29 EST


From: Arvind Sankar <nivedita@xxxxxxxxxxxx>

commit 1fd9717d75df68e3c3509b8e7b1138ca63472f88 upstream.

Arguments after "--" are arguments for init, not for the kernel.

Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Arvind Sankar <nivedita@xxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20200725155916.1376773-1-nivedita@xxxxxxxxxxxx
Signed-off-by: Ard Biesheuvel <ardb@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
drivers/firmware/efi/libstub/efi-stub-helper.c | 2 ++
1 file changed, 2 insertions(+)

--- a/drivers/firmware/efi/libstub/efi-stub-helper.c
+++ b/drivers/firmware/efi/libstub/efi-stub-helper.c
@@ -201,6 +201,8 @@ efi_status_t efi_parse_options(char cons
char *param, *val;

str = next_arg(str, &param, &val);
+ if (!val && !strcmp(param, "--"))
+ break;

if (!strcmp(param, "nokaslr")) {
efi_nokaslr = true;