Skip to content

Commit

Permalink
Further improve load_certs() for non-compliant drivers/firmwares
Browse files Browse the repository at this point in the history
Following the discovery of more problematic firmwares and drivers
affected by the issue c28b9855d0befbd07f46ced5c06c6d799c9d9d00 is
designed to address (e.g. #558),
this patch further improves the code so that, instead of simply bailing
out, we progressively increase the buffer sizes, until either success
or a maximum size limit is reached.

In most cases, this workaround should be enough to ensure completion
of the directory read and thus provide full shim functionality (while
still warning the user about the non-compliance of their environment).
  • Loading branch information
pbatard committed Mar 31, 2023
1 parent f23883c commit 693e970
Showing 1 changed file with 20 additions and 10 deletions.
30 changes: 20 additions & 10 deletions shim.c
Original file line number Diff line number Diff line change
Expand Up @@ -1486,18 +1486,28 @@ load_certs(EFI_HANDLE image_handle)
UINTN old = buffersize;
efi_status = dir->Read(dir, &buffersize, buffer);
if (efi_status == EFI_BUFFER_TOO_SMALL) {
if (buffersize != old) {
buffer = ReallocatePool(buffer, old, buffersize);
if (buffer == NULL) {
perror(L"Failed to read directory %s - %r\n",
PathName, EFI_OUT_OF_RESOURCES);
if (buffersize == old) {
/*
* Some UEFI drivers or firmwares are not compliant with
* the EFI_FILE_PROTOCOL.Read() specs and do not return the
* required buffer size along with EFI_BUFFER_TOO_SMALL.
* Work around this by progressively increasing the buffer
* size, up to a certain point, until the call succeeds.
*/
perror(L"Error reading directory %s - "
L"non-compliant UEFI driver or firmware!\n",
PathName);
buffersize = (buffersize < 4) ? 4 : buffersize * 2;
if (buffersize > 1024)
goto done;
}
continue;
}
perror(L"Failed to read directory %s - buggy firmware\n",
PathName);
goto done;
buffer = ReallocatePool(buffer, old, buffersize);
if (buffer == NULL) {
perror(L"Failed to read directory %s - %r\n",
PathName, EFI_OUT_OF_RESOURCES);
goto done;
}
continue;
} else if (EFI_ERROR(efi_status)) {
perror(L"Failed to read directory %s - %r\n", PathName,
efi_status);
Expand Down

0 comments on commit 693e970

Please sign in to comment.