"Das U-Boot" Source Tree
Merge tag 'efi-2026-04-rc4' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2026-04-rc4
CI: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/29389
UEFI:
* Correct LoadImage() return code for invalid parameters
and provide a test for it.
* Correct misspells in the test code.
+17
-6
+6
-2
lib/efi_loader/efi_boottime.c
+6
-2
lib/efi_loader/efi_boottime.c
···
2096
2096
EFI_ENTRY("%d, %p, %pD, %p, %zu, %p", boot_policy, parent_image,
2097
2097
file_path, source_buffer, source_size, image_handle);
2098
2098
2099
-
if (!image_handle || (!source_buffer && !file_path) ||
2100
-
!efi_search_obj(parent_image) ||
2099
+
if (!source_buffer && !file_path) {
2100
+
ret = EFI_NOT_FOUND;
2101
+
goto error;
2102
+
}
2103
+
2104
+
if (!image_handle || !efi_search_obj(parent_image) ||
2101
2105
/* The parent image handle must refer to a loaded image */
2102
2106
!parent_image->type) {
2103
2107
ret = EFI_INVALID_PARAMETER;
+7
lib/efi_selftest/efi_selftest_loadimage.c
+7
lib/efi_selftest/efi_selftest_loadimage.c
···
562
562
return EFI_ST_FAILURE;
563
563
}
564
564
565
+
ret = boottime->load_image(false, handle_image, NULL, NULL, 0,
566
+
&handle);
567
+
if (ret != EFI_NOT_FOUND) {
568
+
efi_st_error("Unexpected load_image return value\n");
569
+
return EFI_ST_FAILURE;
570
+
}
571
+
565
572
return EFI_ST_SUCCESS;
566
573
}
567
574
+4
-4
lib/efi_selftest/efi_selftest_manageprotocols.c
+4
-4
lib/efi_selftest/efi_selftest_manageprotocols.c
···
6
6
*
7
7
* This unit test checks the following protocol services:
8
8
* InstallProtocolInterface, UninstallProtocolInterface,
9
-
* InstallMultipleProtocolsInterfaces, UninstallMultipleProtocolsInterfaces,
9
+
* InstallMultipleProtocolInterfaces, UninstallMultipleProtocolInterfaces,
10
10
* HandleProtocol, ProtocolsPerHandle,
11
11
* LocateHandle, LocateHandleBuffer.
12
12
*/
···
189
189
}
190
190
191
191
/*
192
-
* Test error handling in UninstallMultipleProtocols
192
+
* Test error handling in UninstallMultipleProtocolInterfaces
193
193
*
194
194
* These are the installed protocol interfaces on handle 2:
195
195
*
···
240
240
efi_st_error("LocateHandleBuffer failed to locate new handle\n");
241
241
return EFI_ST_FAILURE;
242
242
}
243
-
/* Clear the buffer, we are reusing it it the next step. */
243
+
/* Clear the buffer, we are reusing it in the next step. */
244
244
boottime->set_mem(buffer, sizeof(efi_handle_t) * buffer_size, 0);
245
245
246
246
/*
···
289
289
}
290
290
291
291
/*
292
-
* Test UninstallMultipleProtocols
292
+
* Test UninstallMultipleProtocolInterfaces
293
293
*/
294
294
ret = boottime->uninstall_multiple_protocol_interfaces(
295
295
handle2,