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

efi_loader: CloseProtocol in tcg2_measure_gpt_data

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.
* Remove a superfluous goto.

Fixes: ce3dbc5d080d ("efi_loader: add UEFI GPT measurement")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
This commit is contained in:
Heinrich Schuchardt 2022-10-07 14:28:18 +02:00
parent fcdf531dbc
commit bb8bb3033e
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/efi_loader/efi_tcg2.c
View File

@ -2053,7 +2053,7 @@ tcg2_measure_gpt_data(struct udevice *dev,
{ {
efi_status_t ret; efi_status_t ret;
efi_handle_t handle; efi_handle_t handle;
struct efi_handler *dp_handler; struct efi_handler *dp_handler, *io_handler;
struct efi_device_path *orig_device_path; struct efi_device_path *orig_device_path;
struct efi_device_path *device_path; struct efi_device_path *device_path;
struct efi_device_path *dp; struct efi_device_path *dp;
@ -2098,10 +2098,10 @@ tcg2_measure_gpt_data(struct udevice *dev,
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
goto out1; goto out1;
ret = EFI_CALL(efi_handle_protocol(handle, ret = efi_search_protocol(handle, &efi_block_io_guid, &io_handler);
&efi_block_io_guid, (void **)&block_io));
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
goto out1; goto out1;
block_io = io_handler->protocol_interface;
gpt_h = memalign(block_io->media->io_align, block_io->media->block_size); gpt_h = memalign(block_io->media->io_align, block_io->media->block_size);
if (!gpt_h) { if (!gpt_h) {
@ -2164,12 +2164,8 @@ tcg2_measure_gpt_data(struct udevice *dev,
} }
ret = tcg2_measure_event(dev, 5, EV_EFI_GPT_EVENT, event_size, (u8 *)event); ret = tcg2_measure_event(dev, 5, EV_EFI_GPT_EVENT, event_size, (u8 *)event);
if (ret != EFI_SUCCESS)
goto out2;
out2: out2:
EFI_CALL(efi_close_protocol((efi_handle_t)block_io, &efi_block_io_guid,
NULL, NULL));
free(gpt_h); free(gpt_h);
free(entry); free(entry);
free(event); free(event);