BPI/arm-trusted-firmware
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix(el3-spmc): fix v1.0 EMAD traversal" into integration

Browse Source
This commit is contained in:
Madhukar Pappireddy 2026-05-06 13:00:16 +00:00 committed by TrustedFirmware Code Review
commit 54e05377ab
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
services/std_svc/spm/el3_spmc/spmc_shared_mem.c
View File

@ -229,6 +229,12 @@ spmc_shmem_obj_get_emad(const struct ffa_mtd *desc, uint32_t index,
return (emad + (*emad_size * index));
}
static inline const struct ffa_emad_v1_0 *
emad_advance(const struct ffa_emad_v1_0 *emad, size_t offset)
{
return (const struct ffa_emad_v1_0 *)((const uint8_t *)emad + offset);
}
/**
* spmc_shmem_obj_get_comp_mrd - Get comp_mrd from a mtd struct based on the
* FF-A version of the descriptor.
@ -563,7 +569,7 @@ spmc_shm_convert_mtd_to_v1_0(struct spmc_shmem_obj *out_obj,
{
struct ffa_mtd *mtd_orig = &orig->desc;
struct ffa_mtd_v1_0 *out = (struct ffa_mtd_v1_0 *) &out_obj->desc;
struct ffa_emad_v1_0 *emad_in;
const struct ffa_emad_v1_0 *emad_in;
struct ffa_emad_v1_0 *emad_array_in;
struct ffa_emad_v1_0 *emad_array_out;
struct ffa_comp_mrd *mrd_in;
@ -589,7 +595,7 @@ spmc_shm_convert_mtd_to_v1_0(struct spmc_shmem_obj *out_obj,
emad_array_out = out->emad;
/* Copy across the emad structs. */
emad_in = emad_array_in;
emad_in = (const struct ffa_emad_v1_0 *)emad_array_in;
for (unsigned int i = 0U; i < out->emad_count; i++) {
/* Bound check for emad array. */
if (((uint8_t *)emad_in + sizeof(struct ffa_emad_v1_0)) >
@ -600,7 +606,7 @@ spmc_shm_convert_mtd_to_v1_0(struct spmc_shmem_obj *out_obj,
memcpy(&emad_array_out[i], emad_in,
sizeof(struct ffa_emad_v1_0));
emad_in += mtd_orig->emad_size;
emad_in = emad_advance(emad_in, mtd_orig->emad_size);
}
/* Place the mrd descriptors after the end of the emad descriptors. */
@ -627,13 +633,13 @@ spmc_shm_convert_mtd_to_v1_0(struct spmc_shmem_obj *out_obj,
* Update the offset in the emads by the delta between the input and
* output addresses.
*/
emad_in = emad_array_in;
emad_in = (const struct ffa_emad_v1_0 *)emad_array_in;
for (unsigned int i = 0U; i < out->emad_count; i++) {
emad_array_out[i].comp_mrd_offset = emad_in->comp_mrd_offset +
(mrd_out_offset -
mrd_in_offset);
emad_in += mtd_orig->emad_size;
emad_in = emad_advance(emad_in, mtd_orig->emad_size);
}
/* Verify that we stay within bound of the memory descriptors. */
@ -806,12 +812,6 @@ spmc_validate_mtd_start(struct ffa_mtd *desc, uint32_t ffa_version,
return 0;
}
static inline const struct ffa_emad_v1_0 *
emad_advance(const struct ffa_emad_v1_0 *emad, size_t offset)
{
return (const struct ffa_emad_v1_0 *)((const uint8_t *)emad + offset);
}
/**
* spmc_shmem_check_obj - Check that counts in descriptor match overall size.
* @obj: Object containing ffa_memory_region_descriptor.