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

Merge changes from topic "ffa_el3_spmc_fixes" into integration

Browse source 
* changes:
  fix(el3-spmc): check descriptor size for overflow
  fix(el3-spmc): fix location of fragment length check
  fix(el3-spmc): fix detection of overlapping memory regions
  fix(el3-spmc): fix incomplete reclaim validation
This commit is contained in:
Joanna Farley 2022-11-10 13:46:33 +01:00 • committed by TrustedFirmware Code Review
commit 7eb6fa4a22
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
services/std_svc/spm/el3_spmc/spmc_shared_mem.c
View file

@ -72,13 +72,23 @@ spmc_shmem_obj_alloc(struct spmc_shmem_obj_state *state, size_t desc_size)
{
struct spmc_shmem_obj *obj;
size_t free = state->data_size - state->allocated;
size_t obj_size;
if (state->data == NULL) {
ERROR("Missing shmem datastore!\n");
return NULL;
}
if (spmc_shmem_obj_size(desc_size) > free) {
obj_size = spmc_shmem_obj_size(desc_size);
/* Ensure the obj size has not overflowed. */
if (obj_size < desc_size) {
WARN("%s(0x%zx) desc_size overflow\n",
__func__, desc_size);
return NULL;
}
if (obj_size > free) {
WARN("%s(0x%zx) failed, free 0x%zx\n",
__func__, desc_size, free);
return NULL;
@ -88,7 +98,7 @@ spmc_shmem_obj_alloc(struct spmc_shmem_obj_state *state, size_t desc_size)
obj->desc_size = desc_size;
obj->desc_filled = 0;
obj->in_use = 0;
state->allocated += spmc_shmem_obj_size(desc_size);
state->allocated += obj_size;
return obj;
}
@ -330,10 +340,9 @@ overlapping_memory_regions(struct ffa_comp_mrd *region1,
PAGE_SIZE_4KB;
region2_end = region2_start + region2_size;
if ((region1_start >= region2_start &&
region1_start < region2_end) ||
(region1_end > region2_start
&& region1_end < region2_end)) {
/* Check if regions are not overlapping. */
if (!((region2_end <= region1_start) ||
(region1_end <= region2_start))) {
WARN("Overlapping mem regions 0x%lx-0x%lx & 0x%lx-0x%lx\n",
region1_start, region1_end,
region2_start, region2_end);
@ -886,9 +895,6 @@ static long spmc_ffa_fill_desc(struct mailbox *mbox,
goto err_arg;
}
memcpy((uint8_t *)&obj->desc + obj->desc_filled,
(uint8_t *) mbox->tx_buffer, fragment_length);
if (fragment_length > obj->desc_size - obj->desc_filled) {
WARN("%s: bad fragment size %u > %zu remaining\n", __func__,
fragment_length, obj->desc_size - obj->desc_filled);
@ -896,6 +902,9 @@ static long spmc_ffa_fill_desc(struct mailbox *mbox,
goto err_arg;
}
memcpy((uint8_t *)&obj->desc + obj->desc_filled,
(uint8_t *) mbox->tx_buffer, fragment_length);
/* Ensure that the sender ID resides in the normal world. */
if (ffa_is_secure_world_id(obj->desc.sender_id)) {
WARN("%s: Invalid sender ID 0x%x.\n",
@ -1828,6 +1837,13 @@ int spmc_ffa_mem_reclaim(uint32_t smc_fid,
goto err_unlock;
}
if (obj->desc_filled != obj->desc_size) {
WARN("%s: incomplete object desc filled %zu < size %zu\n",
__func__, obj->desc_filled, obj->desc_size);
ret = FFA_ERROR_INVALID_PARAMETER;
goto err_unlock;
}
/* Allow for platform specific operations to be performed. */
ret = plat_spmc_shmem_reclaim(&obj->desc);
if (ret != 0) {