efi_loader: fix ecpt size computation

The size of the memory allocated for the EFI Conformance Profiles Table is
computed with `num_entries' always equal to zero, which is incorrect when
CONFIG_EFI_EBBR_2_1_CONFORMANCE is enabled.

This can be verified by allocating the ECPT memory with malloc() instead of
efi_allocate_pool(), building u-boot with sandbox_defconfig and
CONFIG_VALGRIND=y, and by finally running the following command:

  valgrind --suppressions=scripts/u-boot.supp \
    ./u-boot -T -c 'efidebug tables'

Fix this by using an array of the supported profiles GUIDs instead, which
should also be easier to extend in the future as U-Boot should publish the
GUIDs for all supported EBBR revisions.

Fixes: 6b92c1735205 ("efi: Create ECPT table")
Suggested-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
Cc: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Cc: Tom Rini <trini@konsulko.com>
Cc: Jose Marinho <jose.marinho@arm.com>
Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

diff --git a/lib/efi_loader/efi_conformance.c b/lib/efi_loader/efi_conformance.c
index 2bae93a94bd7c5ef7206a93315722e406ed949b1..2d31800ccb81422c104d8f64efebea358e301944 100644 (file)
--- a/lib/efi_loader/efi_conformance.c
+++ b/lib/efi_loader/efi_conformance.c
@@ -13,8 +13,6 @@
 #include <malloc.h>
 
 static const efi_guid_t efi_ecpt_guid = EFI_CONFORMANCE_PROFILES_TABLE_GUID;
-static const efi_guid_t efi_ebbr_2_1_guid =
-       EFI_CONFORMANCE_PROFILE_EBBR_2_1_GUID;
 
 /**
  * efi_ecpt_register() - Install the ECPT system table.
@@ -23,12 +21,17 @@ static const efi_guid_t efi_ebbr_2_1_guid =
  */
 efi_status_t efi_ecpt_register(void)
 {
-       u16 num_entries = 0;
        struct efi_conformance_profiles_table *ecpt;
        efi_status_t ret;
        size_t ecpt_size;
 
-       ecpt_size = num_entries * sizeof(efi_guid_t)
+       static const efi_guid_t profiles[] = {
+       #if CONFIG_IS_ENABLED(EFI_EBBR_2_1_CONFORMANCE)
+               EFI_CONFORMANCE_PROFILE_EBBR_2_1_GUID,
+       #endif
+       };
+
+       ecpt_size = sizeof(profiles)
                + sizeof(struct efi_conformance_profiles_table);
        ret = efi_allocate_pool(EFI_BOOT_SERVICES_DATA, ecpt_size,
                                (void **)&ecpt);
@@ -39,12 +42,9 @@ efi_status_t efi_ecpt_register(void)
                return ret;
        }
 
-       if (CONFIG_IS_ENABLED(EFI_EBBR_2_1_CONFORMANCE))
-               guidcpy(&ecpt->conformance_profiles[num_entries++],
-                       &efi_ebbr_2_1_guid);
-
+       memcpy(ecpt->conformance_profiles, profiles, sizeof(profiles));
        ecpt->version = EFI_CONFORMANCE_PROFILES_TABLE_VERSION;
-       ecpt->number_of_profiles = num_entries;
+       ecpt->number_of_profiles = ARRAY_SIZE(profiles);
 
        /* Install the ECPT in the system configuration table. */
        ret = efi_install_configuration_table(&efi_ecpt_guid, (void *)ecpt);