leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efi_loader: simplify PE consistency check

Browse Source 
Knowing that at least one section header follows the optional header we
only need to check for the length of the 64bit header which is longer than
the 32bit header.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt 2020-05-30 07:35:59 +02:00
parent 13f62d9f7e
commit 55af40a578
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/efi_loader/efi_image_loader.c
View File

@ -637,21 +637,18 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle,
goto err; goto err;
} }
/* assume sizeof(IMAGE_NT_HEADERS32) <= sizeof(IMAGE_NT_HEADERS64) */ /*
if (efi_size < dos->e_lfanew + sizeof(IMAGE_NT_HEADERS32)) { * Check if the image section header fits into the file. Knowing that at
* least one section header follows we only need to check for the length
* of the 64bit header which is longer than the 32bit header.
*/
if (efi_size < dos->e_lfanew + sizeof(IMAGE_NT_HEADERS64)) {
printf("%s: Invalid offset for Extended Header\n", __func__); printf("%s: Invalid offset for Extended Header\n", __func__);
ret = EFI_LOAD_ERROR; ret = EFI_LOAD_ERROR;
goto err; goto err;
} }
nt = (void *) ((char *)efi + dos->e_lfanew); nt = (void *) ((char *)efi + dos->e_lfanew);
if ((nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) &&
(efi_size < dos->e_lfanew + sizeof(IMAGE_NT_HEADERS64))) {
printf("%s: Invalid offset for Extended Header\n", __func__);
ret = EFI_LOAD_ERROR;
goto err;
}
if (nt->Signature != IMAGE_NT_SIGNATURE) { if (nt->Signature != IMAGE_NT_SIGNATURE) {
printf("%s: Invalid NT Signature\n", __func__); printf("%s: Invalid NT Signature\n", __func__);
ret = EFI_LOAD_ERROR; ret = EFI_LOAD_ERROR;