commit 0b9c012f21b341f7d14cc5aff4e1684ea7851721
author Pengyu Lv <pengyu.lv@arm.com> Wed Mar 15 14:37:32 2023 +0800
committer Pengyu Lv <pengyu.lv@arm.com> Wed Mar 15 14:37:32 2023 +0800
tree 0823feefde87cb8476a8e45889c7c57038fe0497
parent 744b507866bc8b31177d7dde81ddfdb378f60d1f

ssl_cache: return the error code for mutex failure

Signed-off-by: Pengyu Lv <pengyu.lv@arm.com>

include/mbedtls/ssl_cache.h

diff --git a/include/mbedtls/ssl_cache.h b/include/mbedtls/ssl_cache.h
index 41ada54..55dcf77 100644
--- a/include/mbedtls/ssl_cache.h
+++ b/include/mbedtls/ssl_cache.h
@@ -134,7 +134,7 @@
  *
  * \return                0: The cache entry for session with provided ID
  *                           is removed or does not exist.
- *                        1: Internal error.
+ *                        Otherwise: fail.
  */
 int mbedtls_ssl_cache_remove(void *data,
                              unsigned char const *session_id,

library/ssl_cache.c

diff --git a/library/ssl_cache.c b/library/ssl_cache.c
index d93508c..048c21d 100644
--- a/library/ssl_cache.c
+++ b/library/ssl_cache.c
@@ -92,8 +92,8 @@
     mbedtls_ssl_cache_entry *entry;
 
 #if defined(MBEDTLS_THREADING_C)
-    if (mbedtls_mutex_lock(&cache->mutex) != 0) {
-        return 1;
+    if ((ret = mbedtls_mutex_lock(&cache->mutex)) != 0) {
+        return ret;
     }
 #endif
 
@@ -114,7 +114,7 @@
 exit:
 #if defined(MBEDTLS_THREADING_C)
     if (mbedtls_mutex_unlock(&cache->mutex) != 0) {
-        ret = 1;
+        ret = MBEDTLS_ERR_THREADING_MUTEX_ERROR;
     }
 #endif
 
@@ -318,7 +318,7 @@
 exit:
 #if defined(MBEDTLS_THREADING_C)
     if (mbedtls_mutex_unlock(&cache->mutex) != 0) {
-        ret = 1;
+        ret = MBEDTLS_ERR_THREADING_MUTEX_ERROR;
     }
 #endif
 
@@ -341,8 +341,8 @@
     mbedtls_ssl_cache_entry *prev;
 
 #if defined(MBEDTLS_THREADING_C)
-    if (mbedtls_mutex_lock(&cache->mutex) != 0) {
-        return 1;
+    if ((ret = mbedtls_mutex_lock(&cache->mutex)) != 0) {
+        return ret;
     }
 #endif
 
@@ -373,7 +373,7 @@
 exit:
 #if defined(MBEDTLS_THREADING_C)
     if (mbedtls_mutex_unlock(&cache->mutex) != 0) {
-        ret = 1;
+        ret = MBEDTLS_ERR_THREADING_MUTEX_ERROR;
     }
 #endif