]> git.baikalelectronics.ru Git - arm-tf.git/commitdiff
fix(el3-spmc): deadlock when relinquishing memory
authorvallau01 <valentin.laurent@trustonic.com>
Tue, 9 Aug 2022 15:06:53 +0000 (17:06 +0200)
committerLukas Hanel <lukas.hanel@trustonic.com>
Wed, 2 Nov 2022 14:15:59 +0000 (15:15 +0100)
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

index 5a3fe94cd191233009095890c1093d95878b20ae..e137346e0b4740825db5835826c1ca5452fbf818 100644 (file)
@@ -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. */