commit 9dc076b4f49ceedb2bfae13c74ae58c3251d1a95
author Ryan Everett <ryan.everett@arm.com> Fri Feb 09 14:20:09 2024 +0000
committer Ryan Everett <ryan.everett@arm.com> Fri Feb 09 14:20:09 2024 +0000
tree 34162e42295746cd6f941a3bf551edf8a6f42f9c
parent 7fee4f731895aa13a11dd353ead4ee9e9e260e9e

Fix issue with lock failures returning CORRUPTION_DETECTED

Signed-off-by: Ryan Everett <ryan.everett@arm.com>

library/psa_crypto_slot_management.c

diff --git a/library/psa_crypto_slot_management.c b/library/psa_crypto_slot_management.c
index 9890de6..dc38662 100644
--- a/library/psa_crypto_slot_management.c
+++ b/library/psa_crypto_slot_management.c
@@ -529,6 +529,9 @@
     }
 
 #if defined(MBEDTLS_THREADING_C)
+    /* We need to set status as success, otherwise CORRUPTION_DETECTED
+     * would be returned if the lock fails. */
+    status = PSA_SUCCESS;
     PSA_THREADING_CHK_RET(mbedtls_mutex_lock(
                               &mbedtls_threading_key_slot_mutex));
 #endif
@@ -563,6 +566,9 @@
     psa_key_slot_t *slot;
 
 #if defined(MBEDTLS_THREADING_C)
+    /* We need to set status as success, otherwise CORRUPTION_DETECTED
+     * would be returned if the lock fails. */
+    status = PSA_SUCCESS;
     PSA_THREADING_CHK_RET(mbedtls_mutex_lock(
                               &mbedtls_threading_key_slot_mutex));
 #endif