Mbed-TLS/mbedtls-framework
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls-framework.git synced 2026-09-14 14:19:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Double free on a mutex is now a no-op

Browse Source 
Since TF-PSA-Crypto 1.0 (threading internal interface version 4.0.0.1),
`mbedtls_mutex_free()` on an all-bits-zero mutex is defined to be a no-op.

Signed-off-by: Gilles Peskine <[email protected]>
This commit is contained in:
Gilles Peskine
2025-09-06 19:59:31 +02:00
parent bedd856cad
commit 5b46871e5a
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/programs/metatest.c
+15 -1
View File
@@ -39,7 +39,7 @@
#include <string.h> #include <string.h>
#if defined(MBEDTLS_THREADING_C) #if defined(MBEDTLS_THREADING_C)
#include <mbedtls/threading.h> #include "threading_internal.h"
#endif #endif
@@ -285,6 +285,10 @@ exit:
#endif #endif
} }
/* Since TF-PSA-Crypto 1.0, mbedtls_mutex_free() on an all-bits-zero
* mutex is defined to be a no-op. In earlier library versions,
* it had undefined behavior. */
#if MBEDTLS_THREADING_INTERNAL_VERSION <= 0x04000000
static void mutex_free_not_initialized(const char *name) static void mutex_free_not_initialized(const char *name)
{ {
(void) name; (void) name;
@@ -298,6 +302,7 @@ static void mutex_free_not_initialized(const char *name)
mbedtls_mutex_free(&mutex); mbedtls_mutex_free(&mutex);
#endif #endif
} }
#endif
static void mutex_double_init(const char *name) static void mutex_double_init(const char *name)
{ {
@@ -314,6 +319,10 @@ static void mutex_double_init(const char *name)
#endif #endif
} }
/* Since TF-PSA-Crypto 1.0, mbedtls_mutex_free() on an all-bits-zero
* mutex is defined to be a no-op. In earlier library versions,
* it had undefined behavior. */
#if MBEDTLS_THREADING_INTERNAL_VERSION <= 0x04000000
static void mutex_double_free(const char *name) static void mutex_double_free(const char *name)
{ {
(void) name; (void) name;
@@ -328,6 +337,7 @@ static void mutex_double_free(const char *name)
mbedtls_mutex_free(&mutex); mbedtls_mutex_free(&mutex);
#endif #endif
} }
#endif
static void mutex_leak(const char *name) static void mutex_leak(const char *name)
{ {
@@ -417,9 +427,13 @@ metatest_t metatests[] = {
{ "test_memory_poison_7_1_2_w", "poison", test_memory_poison }, { "test_memory_poison_7_1_2_w", "poison", test_memory_poison },
{ "mutex_lock_not_initialized", "pthread", mutex_lock_not_initialized }, { "mutex_lock_not_initialized", "pthread", mutex_lock_not_initialized },
{ "mutex_unlock_not_initialized", "pthread", mutex_unlock_not_initialized }, { "mutex_unlock_not_initialized", "pthread", mutex_unlock_not_initialized },
#if MBEDTLS_THREADING_INTERNAL_VERSION <= 0x04000000
{ "mutex_free_not_initialized", "pthread", mutex_free_not_initialized }, { "mutex_free_not_initialized", "pthread", mutex_free_not_initialized },
#endif
{ "mutex_double_init", "pthread", mutex_double_init }, { "mutex_double_init", "pthread", mutex_double_init },
#if MBEDTLS_THREADING_INTERNAL_VERSION <= 0x04000000
{ "mutex_double_free", "pthread", mutex_double_free }, { "mutex_double_free", "pthread", mutex_double_free },
#endif
{ "mutex_leak", "pthread", mutex_leak }, { "mutex_leak", "pthread", mutex_leak },
{ NULL, NULL, NULL } { NULL, NULL, NULL }
}; };