]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
MUTEX: Assert on locking failure
authorHugo Landau <hlandau@openssl.org>
Thu, 31 Aug 2023 17:54:16 +0000 (18:54 +0100)
committerHugo Landau <hlandau@openssl.org>
Tue, 5 Sep 2023 10:45:44 +0000 (11:45 +0100)
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21919)

crypto/thread/arch/thread_posix.c

index 0ab27b12302dd0a89a51c73c989270f2d0e0bfb2..f88323820f486a269c5bf6ec1cf21a551ce8b267 100644 (file)
@@ -120,18 +120,22 @@ int ossl_crypto_mutex_try_lock(CRYPTO_MUTEX *mutex)
 
 void ossl_crypto_mutex_lock(CRYPTO_MUTEX *mutex)
 {
+    int rc;
     pthread_mutex_t *mutex_p;
 
     mutex_p = (pthread_mutex_t *)mutex;
-    pthread_mutex_lock(mutex_p);
+    rc = pthread_mutex_lock(mutex_p);
+    OPENSSL_assert(rc == 0);
 }
 
 void ossl_crypto_mutex_unlock(CRYPTO_MUTEX *mutex)
 {
+    int rc;
     pthread_mutex_t *mutex_p;
 
     mutex_p = (pthread_mutex_t *)mutex;
-    pthread_mutex_unlock(mutex_p);
+    rc = pthread_mutex_unlock(mutex_p);
+    OPENSSL_assert(rc == 0);
 }
 
 void ossl_crypto_mutex_free(CRYPTO_MUTEX **mutex)