From c9c1cdbda3deea265838cf6c6bd6a1eb1569e15c Mon Sep 17 00:00:00 2001 From: Masahisa Kojima Date: Tue, 9 Nov 2021 18:44:54 +0900 Subject: [PATCH] efi_loader: fix BootOrder variable measurement handling UEFI specification does not require that BootOrder is defined. In current implementation, boot variable measurement fails and returns EFI_NOT_FOUND if BootOrder is not defined. This commit correcly handles this case, skip the boot variable measurement if BootOrder is not defined. Signed-off-by: Masahisa Kojima Acked-by: Ilias Apalodimas Reviewed-by: Heinrich Schuchardt --- lib/efi_loader/efi_tcg2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c index 586f73af6d..189e4a5ba5 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -1452,8 +1452,8 @@ static efi_status_t tcg2_measure_boot_variable(struct udevice *dev) boot_order = efi_get_var(var_name, &efi_global_variable_guid, &var_data_size); if (!boot_order) { - ret = EFI_NOT_FOUND; - goto error; + /* If "BootOrder" is not defined, skip the boot variable measurement */ + return EFI_SUCCESS; } ret = tcg2_measure_variable(dev, 1, EV_EFI_VARIABLE_BOOT2, var_name, -- 2.39.5