[tip: efi/urgent] efi/libstub: Stop parsing arguments at "--"

[tip-bot2 for Arvind Sankar]

The following commit has been merged into the efi/urgent branch of tip:

Commit-ID:     1fd9717d75df68e3c3509b8e7b1138ca63472f88
Gitweb:        https://git.kernel.org/tip/1fd9717d75df68e3c3509b8e7b1138ca63472f88
Author:        Arvind Sankar <nivedita@xxxxxxxxxxxx>
AuthorDate:    Sat, 25 Jul 2020 11:59:16 -04:00
Committer:     Ard Biesheuvel <ardb@xxxxxxxxxx>
CommitterDate: Thu, 20 Aug 2020 11:18:52 +02:00

efi/libstub: Stop parsing arguments at "--"

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>
---
 drivers/firmware/efi/libstub/efi-stub-helper.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/firmware/efi/libstub/efi-stub-helper.c b/drivers/firmware/efi/libstub/efi-stub-helper.c
index 6bca70b..37ff34e 100644
--- 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 const *cmdline)
 		char *param, *val;
 
 		str = next_arg(str, &param, &val);
+		if (!val && !strcmp(param, "--"))
+			break;
 
 		if (!strcmp(param, "nokaslr")) {
 			efi_nokaslr = true;