diff options
| author | Tom Rini <trini@konsulko.com> | 2023-08-03 12:43:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-03 12:43:24 -0400 |
| commit | 6cdd4b8108f57252b8849e71aa46e3a2d227c98d (patch) | |
| tree | 7a1d67347f0fad4eef0a0c95f35dedd866e714aa /lib/efi_loader/efi_image_loader.c | |
| parent | 8b572a387ea907452b4269f9ec9f8321229bd8ec (diff) | |
| parent | cd87d2c61ce8e8e963de514f2c8ab0f959d6b586 (diff) | |
Merge tag 'efi-2023-10-rc2-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2023-10-rc2-2
Documentation:
* Move README.falcon to HTML
* Describe usage of QEMU virtio block device
* Add SPDX license identifiers to svg images
* Add more detail to the description of U-Boot boot phases
UEFI:
* Fix buffer overflows
* Fix memory leak in efi_add_memory_map_pg
* Properly check return values of calloc, uuid_str_to_bin,
efi_parse_pkcs7_header
Diffstat (limited to 'lib/efi_loader/efi_image_loader.c')
| -rw-r--r-- | lib/efi_loader/efi_image_loader.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 26df0da16c..97547571ce 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -592,6 +592,7 @@ static bool efi_image_authenticate(void *efi, size_t efi_size) struct efi_signature_store *db = NULL, *dbx = NULL; void *new_efi = NULL; u8 *auth, *wincerts_end; + u64 new_efi_size = efi_size; size_t auth_size; bool ret = false; @@ -600,11 +601,11 @@ static bool efi_image_authenticate(void *efi, size_t efi_size) if (!efi_secure_boot_enabled()) return true; - new_efi = efi_prepare_aligned_image(efi, (u64 *)&efi_size); + new_efi = efi_prepare_aligned_image(efi, &new_efi_size); if (!new_efi) return false; - if (!efi_image_parse(new_efi, efi_size, ®s, &wincerts, + if (!efi_image_parse(new_efi, new_efi_size, ®s, &wincerts, &wincerts_len)) { log_err("Parsing PE executable image failed\n"); goto out; |