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

Merge tag 'efi-2026-04-rc2' of https://source.denx.de/u-boot/custodians/u-boot-efi

Browse Source 
Pull request efi-2026-04-rc2

CI: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/29203

Documentation:

* Remove pip from requirements.txt
* develop/process: Clarify name usage in the Signed-off-by line

UEFI:

* Improve EFI variable load message
* Fix use after free in efi_exit() with tcg2
* Fix efi_debug_image_info_normal allocation
* Add missing EFI_CALL in efi_net
This commit is contained in:
Tom Rini
2026-02-06 12:35:44 -06:00
parent a54d613baf 36e321b487
commit e5e75ea8c7
6 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/develop/process.rst
+1 -2
View File
@@ -139,8 +139,7 @@ document.
message by which the signer certifies that they were involved in the development
of the patch and that they accept the `Developer Certificate of Origin
<https://developercertificate.org/>`_. Following this and adding a
``Signed-off-by:`` line that contains the developer's name and email address
is required.
``Signed-off-by:`` line using a known identity and email address is required.
* Please note that in U-Boot, we do not add a ``Signed-off-by`` tag if we
just pass on a patch without any changes.
doc/sphinx/requirements.txt
-1
View File
@@ -8,7 +8,6 @@ imagesize==1.4.1
Jinja2==3.1.4
MarkupSafe==3.0.2
packaging==24.1
pip==24.2
Pygments==2.18.0
requests==2.32.4
six==1.16.0
lib/efi_loader/efi_boottime.c
+7 -6
View File
@@ -3494,12 +3494,6 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
if (ret != EFI_SUCCESS)
EFI_PRINT("%s: out of memory\n", __func__);
}
/* efi_delete_image() frees image_obj. Copy before the call. */
exit_jmp = image_obj->exit_jmp;
*image_obj->exit_status = exit_status;
if (image_obj->image_type == IMAGE_SUBSYSTEM_EFI_APPLICATION ||
exit_status != EFI_SUCCESS)
efi_delete_image(image_obj, loaded_image_protocol);
if (IS_ENABLED(CONFIG_EFI_TCG2_PROTOCOL)) {
if (image_obj->image_type == IMAGE_SUBSYSTEM_EFI_APPLICATION) {
@@ -3510,6 +3504,13 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
}
}
/* efi_delete_image() frees image_obj. Copy before the call. */
exit_jmp = image_obj->exit_jmp;
*image_obj->exit_status = exit_status;
if (image_obj->image_type == IMAGE_SUBSYSTEM_EFI_APPLICATION ||
exit_status != EFI_SUCCESS)
efi_delete_image(image_obj, loaded_image_protocol);
/* Make sure entry/exit counts for EFI world cross-overs match */
EFI_EXIT(exit_status);
lib/efi_loader/efi_debug_support.c
+1 -1
View File
@@ -111,7 +111,7 @@ efi_status_t efi_core_new_debug_image_info_entry(u32 image_info_type,
/* Allocate data for new entry. */
ret = efi_allocate_pool(EFI_BOOT_SERVICES_DATA,
sizeof(union efi_debug_image_info),
sizeof(struct efi_debug_image_info_normal),
(void **)(&(*table)[index].normal_image));
if (ret == EFI_SUCCESS && (*table)[index].normal_image) {
/* Update the entry. */
lib/efi_loader/efi_net.c
+4 -2
View File
@@ -1024,8 +1024,10 @@ efi_status_t efi_netobj_set_dp(struct efi_net_obj *netobj, struct efi_device_pat
goto add;
// If it is already installed, try to update it
ret = efi_reinstall_protocol_interface(&netobj->header, &efi_guid_device_path,
phandler->protocol_interface, new_net_dp);
ret = EFI_CALL(efi_reinstall_protocol_interface(&netobj->header,
&efi_guid_device_path,
phandler->protocol_interface,
new_net_dp));
if (ret != EFI_SUCCESS)
return ret;
lib/efi_loader/efi_var_file.c
+1 -1
View File
@@ -173,7 +173,7 @@ efi_status_t efi_var_from_file(void)
r = fs_read(EFI_VAR_FILE_NAME, map_to_sysmem(buf), 0, EFI_VAR_BUF_SIZE,
&len);
if (r || len < sizeof(struct efi_var_file)) {
log_err("Failed to load EFI variables\n");
log_info("No EFI variables loaded\n");
goto error;
}
if (buf->length != len || efi_var_restore(buf, false) != EFI_SUCCESS)