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

Merge changes from topic "el3-spmc" into integration

Browse source 
* changes:
  fix(el3-spmc): error handling in allocation
  fix(el3-spmc): deadlock when relinquishing memory
  fix(el3-spmc): compute full FF-A V1.1 desc size
This commit is contained in:
Olivier Deprez 2022-11-02 19:47:31 +01:00 • committed by TrustedFirmware Code Review
commit 6b2193bd48
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1018,7 +1018,7 @@ static long spmc_ffa_fill_desc(struct mailbox *mbox,
/* Calculate the size that the v1.1 descriptor will required. */
size_t v1_1_desc_size =
spmc_shm_get_v1_1_descriptor_size((void *) &obj->desc,
fragment_length);
obj->desc_size);
if (v1_1_desc_size == 0U) {
ERROR("%s: cannot determine size of descriptor.\n",
@ -1030,7 +1030,7 @@ static long spmc_ffa_fill_desc(struct mailbox *mbox,
v1_1_obj =
spmc_shmem_obj_alloc(&spmc_shmem_obj_state, v1_1_desc_size);
if (!obj) {
if (!v1_1_obj) {
ret = FFA_ERROR_NO_MEMORY;
goto err_arg;
}
@ -1347,7 +1347,8 @@ spmc_ffa_mem_retrieve_req(uint32_t smc_fid,
if (req->emad_count == 0U) {
WARN("%s: unsupported attribute desc count %u.\n",
__func__, obj->desc.emad_count);
return -EINVAL;
ret = FFA_ERROR_INVALID_PARAMETER;
goto err_unlock_mailbox;
}
/* Determine the appropriate minimum descriptor size. */