Commit 8a8a3237 authored by Arvind Sankar's avatar Arvind Sankar Committed by Ard Biesheuvel

efi/libstub: Handle unterminated cmdline

Make the command line parsing more robust, by handling the case it is
not NUL-terminated.

Use strnlen instead of strlen, and make sure that the temporary copy is
NUL-terminated before parsing.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarArvind Sankar <nivedita@alum.mit.edu>
Link: https://lore.kernel.org/r/20200813185811.554051-4-nivedita@alum.mit.eduSigned-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent a37ca6a2
...@@ -194,12 +194,14 @@ efi_status_t efi_parse_options(char const *cmdline) ...@@ -194,12 +194,14 @@ efi_status_t efi_parse_options(char const *cmdline)
if (!cmdline) if (!cmdline)
return EFI_SUCCESS; return EFI_SUCCESS;
len = strlen(cmdline) + 1; len = strnlen(cmdline, COMMAND_LINE_SIZE - 1) + 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;
str = skip_spaces(memcpy(buf, cmdline, len)); memcpy(buf, cmdline, len - 1);
buf[len - 1] = '\0';
str = skip_spaces(buf);
while (*str) { while (*str) {
char *param, *val; char *param, *val;
......
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