Skip to content

Commit

Permalink
Discard load-options that start with a NUL
Browse files Browse the repository at this point in the history
In 6c8d08c ("shim: Ignore UEFI
LoadOptions that are just NUL characters."), a check was added to
discard load options that are entirely NUL.  We now see some firmwares
that start LoadOptions with a NUL, and then follow it with garbage (path
to directory containing loaders).  Widen the check to just discard
anything that starts with a NUL.

Resolves: #490
Related: #95
See-also: https://bugzilla.redhat.com/show_bug.cgi?id=2113005
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  • Loading branch information
frozencemetery committed Aug 23, 2022
1 parent 4fd484e commit 9b2979b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 19 deletions.
18 changes: 0 additions & 18 deletions include/ucs2.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,22 +63,4 @@ StrCSpn(const CHAR16 *s, const CHAR16 *reject)
return ret;
}

/*
* Test if an entire buffer is nothing but NUL characters. This
* implementation "gracefully" ignores the difference between the
* UTF-8/ASCII 1-byte NUL and the UCS-2 2-byte NUL.
*/
static inline bool
__attribute__((__unused__))
is_all_nuls(UINT8 *data, UINTN data_size)
{
UINTN i;

for (i = 0; i < data_size; i++) {
if (data[i] != 0)
return false;
}
return true;
}

#endif /* SHIM_UCS2_H */
7 changes: 6 additions & 1 deletion load-options.c
Original file line number Diff line number Diff line change
Expand Up @@ -404,8 +404,13 @@ parse_load_options(EFI_LOADED_IMAGE *li)

/*
* Apparently sometimes we get L"\0\0"? Which isn't useful at all.
*
* Possibly related, but some boards have additional data before the
* size which is garbage (it's a weird path to the directory
* containing the loaders). Known boards that do this: Kontron VX3040
* (AMI), ASUS B85M-E, and at least one "older Dell laptop".
*/
if (is_all_nuls(li->LoadOptions, li->LoadOptionsSize))
if (((UINT16 *)li->LoadOptions)[0] == 0)
return EFI_SUCCESS;

/*
Expand Down

0 comments on commit 9b2979b

Please sign in to comment.