mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-05-05 12:46:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pull request efi-2026-04-rc4

Browse Source 
UEFI:
 
 * Correct LoadImage() return code for invalid parameters
   and provide a test for it.
 * Correct misspells in the test code.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEbcT5xx8ppvoGt20zxIHbvCwFGsQFAmmhmbMACgkQxIHbvCwF
 GsQXMg//Yw5WETg6p/BVT9YNJJlBI8n3caz42tThZd/kXy4EzU7UVrcDO9a5ZCl2
 A7XWHDqhWFUB8T33d4ebRrJv06R8DM1AoJ7rjh2YlFWnPaVA9cMgchpqWcTW/pEE
 dIeHuShbtx7JXrRuxFbfIrB7CcmpNcoHC+pZK7NIiBsn7obWDfFl6EEURG9bS7hu
 75EsCh0vtuDArFnbb3lbt/L2NzmrNZp1tQ2uVFj+maT+pHPneC0AY0lc897XxKip
 CzusPCEzRme/emyIDHiGIEyRN1MXSFmg+cQVxC2z9E7Ek/p/T+dzAtgUQ74AGh4A
 2rIcFE2rlR7+CI6UEvP2baSAJnnpG11FvI9PJXoca67yu4fJtP1fSQ7ZL2PRSMme
 CziA+2roL1eX8q41UTEFItZRkSQte47F7kFNO818JTnZtC5QV9vrNDqm8fmVZJO/
 pjKHjwh6ww5987DvhH19MUGl1YpU3ke+wIjmCgR8DBG0bXOnEvDM7Xj7AP326W5g
 H2beYKC8VpRj1YY4kWxTx+Dr9nSSuafiYlHjAZRclL6qRy5RmcZ/sWOxmQoPi5if
 AgITFJ1uBWhWzcKGxmv/KzbviP0X4H+XfktFgg7GOIp5GY7oyOUVqZDhMn03tSQp
 nxeseZXM3uUILcVTQTYZSUgqCtuluvJBODbL/LnhnPk4hnNYUXU=
 =zG+G
 -----END PGP SIGNATURE-----

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.
This commit is contained in:
Tom Rini 2026-02-27 08:12:04 -06:00
commit e6e7b2427a
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/efi_loader/efi_boottime.c
View File

@ -2096,8 +2096,12 @@ efi_status_t EFIAPI efi_load_image(bool boot_policy,
EFI_ENTRY("%d, %p, %pD, %p, %zu, %p", boot_policy, parent_image,
file_path, source_buffer, source_size, image_handle);
if (!image_handle || (!source_buffer && !file_path) ||
!efi_search_obj(parent_image) ||
if (!source_buffer && !file_path) {
ret = EFI_NOT_FOUND;
goto error;
}
if (!image_handle || !efi_search_obj(parent_image) ||
/* The parent image handle must refer to a loaded image */
!parent_image->type) {
ret = EFI_INVALID_PARAMETER;

7
lib/efi_selftest/efi_selftest_loadimage.c
View File

@ -562,6 +562,13 @@ static int execute(void)
return EFI_ST_FAILURE;
}
ret = boottime->load_image(false, handle_image, NULL, NULL, 0,
&handle);
if (ret != EFI_NOT_FOUND) {
efi_st_error("Unexpected load_image return value\n");
return EFI_ST_FAILURE;
}
return EFI_ST_SUCCESS;
}

8
lib/efi_selftest/efi_selftest_manageprotocols.c
View File

@ -6,7 +6,7 @@
*
* This unit test checks the following protocol services:
* InstallProtocolInterface, UninstallProtocolInterface,
* InstallMultipleProtocolsInterfaces, UninstallMultipleProtocolsInterfaces,
* InstallMultipleProtocolInterfaces, UninstallMultipleProtocolInterfaces,
* HandleProtocol, ProtocolsPerHandle,
* LocateHandle, LocateHandleBuffer.
*/
@ -189,7 +189,7 @@ static int execute(void)
}
/*
* Test error handling in UninstallMultipleProtocols
* Test error handling in UninstallMultipleProtocolInterfaces
*
* These are the installed protocol interfaces on handle 2:
*
@ -240,7 +240,7 @@ static int execute(void)
efi_st_error("LocateHandleBuffer failed to locate new handle\n");
return EFI_ST_FAILURE;
}
/* Clear the buffer, we are reusing it it the next step. */
/* Clear the buffer, we are reusing it in the next step. */
boottime->set_mem(buffer, sizeof(efi_handle_t) * buffer_size, 0);
/*
@ -289,7 +289,7 @@ static int execute(void)
}
/*
* Test UninstallMultipleProtocols
* Test UninstallMultipleProtocolInterfaces
*/
ret = boottime->uninstall_multiple_protocol_interfaces(
handle2,