From: Masahisa Kojima <masahisa.kojima@linaro.org>
Date: Fri, 3 Sep 2021 01:55:51 +0000 (+0900)
Subject: efi_loader: fix boot_service_capability_min calculation
X-Git-Url: http://git.dujemihanovic.xyz/img/static/git-favicon.png?a=commitdiff_plain;h=db3ed2cf9c67ed6a0da0bab6e43edae90ced4bf2;p=u-boot.git

efi_loader: fix boot_service_capability_min calculation

TCG EFI Protocol Specification requires to the input
ProtocolCapability.Size < size of the EFI_TCG2_BOOT_SERVICE_CAPABILITY
up to and including the vendor ID field.
Current implementation does different calculation, let's fix it.

Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---

diff --git a/include/efi_tcg2.h b/include/efi_tcg2.h
index b6b958da51..a8c43e415f 100644
--- a/include/efi_tcg2.h
+++ b/include/efi_tcg2.h
@@ -127,8 +127,8 @@ struct efi_tcg2_boot_service_capability {
 	efi_tcg_event_algorithm_bitmap active_pcr_banks;
 };
 
+/* up to and including the vendor ID (manufacturer_id) field */
 #define boot_service_capability_min \
-	sizeof(struct efi_tcg2_boot_service_capability) - \
 	offsetof(struct efi_tcg2_boot_service_capability, number_of_pcr_banks)
 
 #define TCG_EFI_SPEC_ID_EVENT_SIGNATURE_03 "Spec ID Event03"