Commit a37ca6a2 authored by Arvind Sankar's avatar Arvind Sankar Committed by Ard Biesheuvel

efi/libstub: Handle NULL cmdline

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: default avatarArvind Sankar <nivedita@alum.mit.edu>
Link: https://lore.kernel.org/r/20200729193300.598448-1-nivedita@alum.mit.eduSigned-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 1fd9717d
...@@ -187,10 +187,14 @@ int efi_printk(const char *fmt, ...) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment