diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2021-04-23 14:48:31 +0300 |
|---|---|---|
| committer |   Ard Biesheuvel <ardb@kernel.org> | 2021-05-22 14:05:32 +0200 |
| commit | c4039b29fe9637e1135912813f830994af4c867f (patch) | |
| tree | ccd6b4efc351e520ec53e7f828ee907dc8de5d0d /drivers/firmware/efi | |
| parent | efi: Allow EFI_MEMORY_XP and EFI_MEMORY_RO both to be cleared (diff) | |
| download | linux-dev-c4039b29fe9637e1135912813f830994af4c867f.tar.xz linux-dev-c4039b29fe9637e1135912813f830994af4c867f.zip | |
efi/libstub: prevent read overflow in find_file_option()
If the buffer has slashes up to the end then this will read past the end
of the array. I don't anticipate that this is an issue for many people
in real life, but it's the right thing to do and it makes static
checkers happy.
Fixes: 7a88a6227dc7 ("efi/libstub: Fix path separator regression")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Diffstat (limited to 'drivers/firmware/efi')
| -rw-r--r-- | drivers/firmware/efi/libstub/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efi/libstub/file.c b/drivers/firmware/efi/libstub/file.c index 4e81c6077188..dd95f330fe6e 100644 --- a/drivers/firmware/efi/libstub/file.c +++ b/drivers/firmware/efi/libstub/file.c @@ -103,7 +103,7 @@ static int find_file_option(const efi_char16_t *cmdline, int cmdline_len, return 0; /* Skip any leading slashes */ - while (cmdline[i] == L'/' || cmdline[i] == L'\\') + while (i < cmdline_len && (cmdline[i] == L'/' || cmdline[i] == L'\\')) i++; while (--result_len > 0 && i < cmdline_len) { |