commit 460d396640b685f6415912b980f639f10651f3e6
author vallau01 <valentin.laurent@trustonic.com> Tue Aug 09 17:06:53 2022 +0200
committer Lukas Hanel <lukas.hanel@trustonic.com> Wed Nov 02 15:15:59 2022 +0100
tree a536941f0b524a441259c9f83a3bd5b3872554a6
parent 46dbac21811bea36d1e16ad86ad9da1332560c0c

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>

services/std_svc/spm/el3_spmc/spmc_shared_mem.c

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 5a3fe94..e137346 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 @@
 	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. */