From ac568b2bccb9da71f2bd7f1c7204189d1ff678d9 Mon Sep 17 00:00:00 2001 From: vallau01 Date: Tue, 9 Aug 2022 17:06:53 +0200 Subject: [PATCH] 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 --- services/std_svc/spm/el3_spmc/spmc_shared_mem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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. */ -- 2.39.5