Commit 8a8a3237 authored Aug 13, 2020 by Arvind Sankar Committed by Ard Biesheuvel Aug 20, 2020

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: 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>

parent a37ca6a2

drivers/firmware/efi/libstub/efi-stub-helper.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -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;

Admin message