From: Masahisa Kojima Date: Tue, 9 Nov 2021 09:44:54 +0000 (+0900) Subject: efi_loader: fix BootOrder variable measurement handling X-Git-Tag: v2025.01-rc5-pxa1908~1638^2~8 X-Git-Url: http://git.dujemihanovic.xyz/%22http:/www.sics.se/static/git-logo.png?a=commitdiff_plain;h=c9c1cdbda3deea265838cf6c6bd6a1eb1569e15c;p=u-boot.git 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 --- 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,