diff options
| author | Arvind Sankar <nivedita@alum.mit.edu> | 2020-08-13 14:58:11 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-26 11:49:19 +0200 |
| commit | 1f802ace4bd5a2762a2e8637f2ea1e3aa31fb0d5 (patch) | |
| tree | 99211da5999aec5ff4ce18972af8022dfa86a666 | |
| parent | ca60a5eb83720d0eb425e6192723afa77ac86a73 (diff) | |
| download | linux-stable-1f802ace4bd5a2762a2e8637f2ea1e3aa31fb0d5.tar.gz linux-stable-1f802ace4bd5a2762a2e8637f2ea1e3aa31fb0d5.tar.bz2 linux-stable-1f802ace4bd5a2762a2e8637f2ea1e3aa31fb0d5.zip | |
efi/libstub: Handle unterminated cmdline
commit 8a8a3237a78cbc0557f0eb16a89f16d616323e99 upstream.
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: Arvind Sankar <nivedita@alum.mit.edu>
Link: https://lore.kernel.org/r/20200813185811.554051-4-nivedita@alum.mit.edu
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/firmware/efi/libstub/efi-stub-helper.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/firmware/efi/libstub/efi-stub-helper.c b/drivers/firmware/efi/libstub/efi-stub-helper.c index f53652a3a106..f735db55adc0 100644 --- a/drivers/firmware/efi/libstub/efi-stub-helper.c +++ b/drivers/firmware/efi/libstub/efi-stub-helper.c @@ -194,12 +194,14 @@ efi_status_t efi_parse_options(char const *cmdline) if (!cmdline) 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); if (status != EFI_SUCCESS) return status; - str = skip_spaces(memcpy(buf, cmdline, len)); + memcpy(buf, cmdline, len - 1); + buf[len - 1] = '\0'; + str = skip_spaces(buf); while (*str) { char *param, *val; |