Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

efi/libstub: fix efi_parse_options() ignoring the default command line 

efi_convert_cmdline() always returns a size of at least 1 because it
counts the NUL terminator, so the "cmdline_size == 0" condition is never
satisfied.

Change it to check if the string starts with a NUL character to get the
intended behavior: to use CONFIG_CMDLINE when load_options_size == 0.

Fixes: 60f38de7a8 ("efi/libstub: Unify command line param parsing")
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Jonathan Marek 2024-10-13 01:11:56 -04:00 committed by Ard Biesheuvel
parent 8e929cb546
commit aacfa0ef24
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/firmware/efi/libstub/efi-stub.c
View File

@ -129,7 +129,7 @@ efi_status_t efi_handle_cmdline(efi_loaded_image_t *image, char **cmdline_ptr)
if (IS_ENABLED(CONFIG_CMDLINE_EXTEND) || if (IS_ENABLED(CONFIG_CMDLINE_EXTEND) ||
IS_ENABLED(CONFIG_CMDLINE_FORCE) || IS_ENABLED(CONFIG_CMDLINE_FORCE) ||
cmdline_size == 0) { cmdline[0] == 0) {
status = efi_parse_options(CONFIG_CMDLINE); status = efi_parse_options(CONFIG_CMDLINE);
if (status != EFI_SUCCESS) { if (status != EFI_SUCCESS) {
efi_err("Failed to parse options\n"); efi_err("Failed to parse options\n");