Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-22 12:34:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(drtm): fix DLME data size check

Browse source 
dlme_data_min_size is currently defined in pages but is being compared
against byte sizes in the code. This patch corrects this issue.

Change-Id: Ib250ef6efedf321706624dfca263e8042a25f6d1
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>
This commit is contained in:
Manish V Badarkhe 2025-02-06 17:02:16 +00:00
parent 7cf3784814
commit 28e8f9d933
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/std_svc/drtm/drtm_main.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2022-2024 Arm Limited. All rights reserved. * Copyright (c) 2022-2025 Arm Limited. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
* *
@ -112,8 +112,6 @@ int drtm_setup(void)
dlme_data_hdr_init.dlme_tcb_hashes_table_size + dlme_data_hdr_init.dlme_tcb_hashes_table_size +
dlme_data_hdr_init.dlme_impdef_region_size; dlme_data_hdr_init.dlme_impdef_region_size;
dlme_data_min_size = page_align(dlme_data_min_size, UP)/PAGE_SIZE;
/* Fill out platform DRTM features structure */ /* Fill out platform DRTM features structure */
/* Only support default PCR schema (0x1) in this implementation. */ /* Only support default PCR schema (0x1) in this implementation. */
ARM_DRTM_TPM_FEATURES_SET_PCR_SCHEMA(plat_drtm_features.tpm_features, ARM_DRTM_TPM_FEATURES_SET_PCR_SCHEMA(plat_drtm_features.tpm_features,
@ -123,7 +121,7 @@ int drtm_setup(void)
ARM_DRTM_TPM_FEATURES_SET_FW_HASH(plat_drtm_features.tpm_features, ARM_DRTM_TPM_FEATURES_SET_FW_HASH(plat_drtm_features.tpm_features,
plat_tpm_feat->firmware_hash_algorithm); plat_tpm_feat->firmware_hash_algorithm);
ARM_DRTM_MIN_MEM_REQ_SET_MIN_DLME_DATA_SIZE(plat_drtm_features.minimum_memory_requirement, ARM_DRTM_MIN_MEM_REQ_SET_MIN_DLME_DATA_SIZE(plat_drtm_features.minimum_memory_requirement,
dlme_data_min_size); page_align(dlme_data_min_size, UP)/PAGE_SIZE);
ARM_DRTM_MIN_MEM_REQ_SET_DCE_SIZE(plat_drtm_features.minimum_memory_requirement, ARM_DRTM_MIN_MEM_REQ_SET_DCE_SIZE(plat_drtm_features.minimum_memory_requirement,
plat_drtm_get_min_size_normal_world_dce()); plat_drtm_get_min_size_normal_world_dce());
ARM_DRTM_DMA_PROT_FEATURES_SET_MAX_REGIONS(plat_drtm_features.dma_prot_features, ARM_DRTM_DMA_PROT_FEATURES_SET_MAX_REGIONS(plat_drtm_features.dma_prot_features,
@ -237,7 +235,7 @@ static enum drtm_retc drtm_dl_prepare_dlme_data(const struct_drtm_dl_args *args)
*/ */
if (dlme_data_max_size < dlme_data_min_size) { if (dlme_data_max_size < dlme_data_min_size) {
ERROR("%s: assertion failed:" ERROR("%s: assertion failed:"
" dlme_data_max_size (%ld) < dlme_data_total_bytes_req (%ld)\n", " dlme_data_max_size (%ld) < dlme_data_min_size (%ld)\n",
__func__, dlme_data_max_size, dlme_data_min_size); __func__, dlme_data_max_size, dlme_data_min_size);
panic(); panic();
} }