summaryrefslogtreecommitdiff
path: root/services/std_svc
diff options
context:
space:
mode:
authorvallau01 <valentin.laurent@trustonic.com>2022-08-09 17:06:53 +0200
committerLukas Hanel <lukas.hanel@trustonic.com>2022-11-02 15:15:59 +0100
commitac568b2bccb9da71f2bd7f1c7204189d1ff678d9 (patch)
treea536941f0b524a441259c9f83a3bd5b3872554a6 /services/std_svc
parentbe075c3edf634a2df1065597266c3e41d284287b (diff)
downloadarm-trusted-firmware-ac568b2bccb9da71f2bd7f1c7204189d1ff678d9.tar.gz
fix(el3-spmc): deadlock when relinquishing memory
Do not forget to pass via err_unlock_mailbox: label. Change-Id: Icfb997b1c7cce196003af2c28bffc50dc73e30b4 Signed-off-by: Lukas Hanel <lukas.hanel@trustonic.com>
Diffstat (limited to 'services/std_svc')
-rw-r--r--services/std_svc/spm/el3_spmc/spmc_shared_mem.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/std_svc/spm/el3_spmc/spmc_shared_mem.c b/services/std_svc/spm/el3_spmc/spmc_shared_mem.c
index 5a3fe94cd..e137346e0 100644
--- a/services/std_svc/spm/el3_spmc/spmc_shared_mem.c
+++ b/services/std_svc/spm/el3_spmc/spmc_shared_mem.c
@@ -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. */