leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efi/libstub: Handle NULL cmdline

Browse Source 
Treat a NULL cmdline the same as empty. Although this is unlikely to
happen in practice, the x86 kernel entry does check for NULL cmdline and
handles it, so do it here as well.

Cc: <stable@vger.kernel.org>
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Link: https://lore.kernel.org/r/20200729193300.598448-1-nivedita@alum.mit.edu
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Arvind Sankar 2020-07-29 15:33:00 -04:00 committed by Ard Biesheuvel
parent 1fd9717d75
commit a37ca6a2af
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/firmware/efi/libstub/efi-stub-helper.c
View File

@ -187,10 +187,14 @@ int efi_printk(const char *fmt, ...)
*/ */
efi_status_t efi_parse_options(char const *cmdline) efi_status_t efi_parse_options(char const *cmdline)
{ {
size_t len = strlen(cmdline) + 1; size_t len;
efi_status_t status; efi_status_t status;
char *str, *buf; char *str, *buf;
if (!cmdline)
return EFI_SUCCESS;
len = strlen(cmdline) + 1;
status = efi_bs_call(allocate_pool, EFI_LOADER_DATA, len, (void **)&buf); status = efi_bs_call(allocate_pool, EFI_LOADER_DATA, len, (void **)&buf);
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
return status; return status;