mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-05-05 04:36:13 +02:00
ca4eda24c6
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>
62 lines
1.3 KiB
C
62 lines
1.3 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* EFI conformance profile table
|
|
*
|
|
* Copyright (C) 2022 Arm Ltd.
|
|
*/
|
|
|
|
#define LOG_CATEGORY LOGC_EFI
|
|
|
|
#include <efi_loader.h>
|
|
#include <log.h>
|
|
#include <efi_api.h>
|
|
#include <malloc.h>
|
|
|
|
static const efi_guid_t efi_ecpt_guid = EFI_CONFORMANCE_PROFILES_TABLE_GUID;
|
|
|
|
/**
|
|
* efi_ecpt_register() - Install the ECPT system table.
|
|
*
|
|
* Return: status code
|
|
*/
|
|
efi_status_t efi_ecpt_register(void)
|
|
{
|
|
struct efi_conformance_profiles_table *ecpt;
|
|
efi_status_t ret;
|
|
size_t ecpt_size;
|
|
|
|
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);
|
|
|
|
if (ret != EFI_SUCCESS) {
|
|
log_err("Out of memory\n");
|
|
|
|
return ret;
|
|
}
|
|
|
|
memcpy(ecpt->conformance_profiles, profiles, sizeof(profiles));
|
|
ecpt->version = EFI_CONFORMANCE_PROFILES_TABLE_VERSION;
|
|
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);
|
|
if (ret != EFI_SUCCESS) {
|
|
log_err("Failed to install ECPT\n");
|
|
efi_free_pool(ecpt);
|
|
|
|
return ret;
|
|
}
|
|
|
|
log_debug("ECPT created\n");
|
|
|
|
return EFI_SUCCESS;
|
|
}
|