WolfSSL
/
wolfBoot
mirror of https://github.com/wolfSSL/wolfBoot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

x86_64_efi: early-return after remaining panic() sites under UNIT_TEST 

do_boot() already returned after its panic() calls, but GetVolume() and
efi_main() did not: under UNIT_TEST panic() returns, so GetVolume() hit a
NULL deref / uninitialized return and efi_main() ran wolfBoot_start().
Return NULL / EFI_LOAD_ERROR at each site (unreachable on target).
pull/882/head
Daniele Lacamera 2026-09-04 21:08:36 +02:00
parent 2dbb8aea01
commit c2916395a9
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hal/x86_64_efi.c
View File

@ -210,19 +210,25 @@ static EFI_FILE_HANDLE GetVolume(EFI_HANDLE image)
status = uefi_call_wrapper(BS->HandleProtocol, 3,
image, &lipGuid, (void **) &loaded_image);
if (status != EFI_SUCCESS)
if (status != EFI_SUCCESS) {
panic();
return NULL; /* Never reached on target (panic() does not return) */
}
status = uefi_call_wrapper(BS->HandleProtocol, 3,
loaded_image->DeviceHandle,
&fsGuid, (VOID*)&IOVolume);
if (status != EFI_SUCCESS)
if (status != EFI_SUCCESS) {
panic();
return NULL; /* Never reached on target (panic() does not return) */
}
status = uefi_call_wrapper(IOVolume->OpenVolume, 2, IOVolume, &Volume);
if (status != EFI_SUCCESS)
if (status != EFI_SUCCESS) {
panic();
return NULL; /* Never reached on target (panic() does not return) */
}
return Volume;
}
@ -353,6 +359,8 @@ efi_main (EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
if (kernel_addr == 0 && update_addr == 0) {
wolfBoot_printf("No image to load\n");
panic();
return EFI_LOAD_ERROR; /* Never reached on target (panic() does not
* return) */
}
wolfBoot_start();