random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

efi_loader: CloseProtocol in efi_fmp_find

Browse Source 
The CloseProtocol() boot service requires a handle as first argument.
Passing the protocol interface is incorrect.

CloseProtocol() only has an effect if called with a non-zero value for
agent_handle. HandleProtocol() uses an opaque agent_handle when invoking
OpenProtocol() (currently NULL). Therefore HandleProtocol() should be
avoided.

* Replace the LocateHandle() call by efi_search_protocol().
* Remove the CloseProtocol() call.

Fixes: 8d99026f0697 ("efi_loader: capsule: support firmware update")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Heinrich Schuchardt 2022-10-07 15:29:52 +02:00
parent bb8bb3033e
commit 56c9f0c44e
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/efi_loader/efi_capsule.c
View File

@ -159,12 +159,14 @@ efi_fmp_find(efi_guid_t *image_type, u8 image_index, u64 instance,
efi_status_t ret; efi_status_t ret;
for (i = 0, handle = handles; i < no_handles; i++, handle++) { for (i = 0, handle = handles; i < no_handles; i++, handle++) {
ret = EFI_CALL(efi_handle_protocol( struct efi_handler *fmp_handler;
*handle,
&efi_guid_firmware_management_protocol, ret = efi_search_protocol(
(void **)&fmp)); *handle, &efi_guid_firmware_management_protocol,
&fmp_handler);
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
continue; continue;
fmp = fmp_handler->protocol_interface;
/* get device's image info */ /* get device's image info */
info_size = 0; info_size = 0;
@ -215,10 +217,6 @@ efi_fmp_find(efi_guid_t *image_type, u8 image_index, u64 instance,
skip: skip:
efi_free_pool(package_version_name); efi_free_pool(package_version_name);
free(image_info); free(image_info);
EFI_CALL(efi_close_protocol(
(efi_handle_t)fmp,
&efi_guid_firmware_management_protocol,
NULL, NULL));
if (found) if (found)
return fmp; return fmp;
} }