X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=crypto%2Fthreads_pthread.c;h=0a6c903b8bb09dcf2a8804d6dde3c627fc632fe3;hb=fb82cbfe3da846d61e1d4c6d14bf7f4111cccbb2;hp=f10757c5dc4737ca49b0e3b049c3fad961667dbe;hpb=2accf3f7e013c3d02312afc27cc2edbd1f149db3;p=openssl.git

diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c
index f10757c5dc..0a6c903b8b 100644
--- a/crypto/threads_pthread.c
+++ b/crypto/threads_pthread.c
@@ -1,40 +1,47 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
 
 #include <openssl/crypto.h>
+#include "internal/cryptlib.h"
 
 #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && !defined(OPENSSL_SYS_WINDOWS)
 
-#ifdef PTHREAD_RWLOCK_INITIALIZER
-    #define OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK
-#endif
+# ifdef PTHREAD_RWLOCK_INITIALIZER
+#  define USE_RWLOCK
+# endif
 
 CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
 {
-#ifdef OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK
-    CRYPTO_RWLOCK *lock = OPENSSL_zalloc(sizeof(pthread_rwlock_t));
-    if (lock == NULL)
+# ifdef USE_RWLOCK
+    CRYPTO_RWLOCK *lock;
+
+    if ((lock = OPENSSL_zalloc(sizeof(pthread_rwlock_t))) == NULL) {
+        /* Don't set error, to avoid recursion blowup. */
         return NULL;
+    }
 
     if (pthread_rwlock_init(lock, NULL) != 0) {
         OPENSSL_free(lock);
         return NULL;
     }
-#else
-    CRYPTO_RWLOCK *lock = OPENSSL_zalloc(sizeof(pthread_mutex_t));
-    if (lock == NULL)
+# else
+    pthread_mutexattr_t attr;
+    CRYPTO_RWLOCK *lock;
+
+    if ((lock = OPENSSL_zalloc(sizeof(pthread_mutex_t))) == NULL) {
+        /* Don't set error, to avoid recursion blowup. */
         return NULL;
+    }
 
-    pthread_mutexattr_t attr;
     pthread_mutexattr_init(&attr);
     pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-    
+
     if (pthread_mutex_init(lock, &attr) != 0) {
         pthread_mutexattr_destroy(&attr);
         OPENSSL_free(lock);
@@ -42,46 +49,46 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
     }
 
     pthread_mutexattr_destroy(&attr);
-#endif
+# endif
 
     return lock;
 }
 
 int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *lock)
 {
-#ifdef OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK
+# ifdef USE_RWLOCK
     if (pthread_rwlock_rdlock(lock) != 0)
         return 0;
-#else
+# else
     if (pthread_mutex_lock(lock) != 0)
         return 0;
-#endif
+# endif
 
     return 1;
 }
 
 int CRYPTO_THREAD_write_lock(CRYPTO_RWLOCK *lock)
 {
-#ifdef OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK
+# ifdef USE_RWLOCK
     if (pthread_rwlock_wrlock(lock) != 0)
         return 0;
-#else
+# else
     if (pthread_mutex_lock(lock) != 0)
         return 0;
-#endif
+# endif
 
     return 1;
 }
 
 int CRYPTO_THREAD_unlock(CRYPTO_RWLOCK *lock)
 {
-#ifdef OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK
+# ifdef USE_RWLOCK
     if (pthread_rwlock_unlock(lock) != 0)
         return 0;
-#else
+# else
     if (pthread_mutex_unlock(lock) != 0)
         return 0;
-#endif
+# endif
 
     return 1;
 }
@@ -91,11 +98,11 @@ void CRYPTO_THREAD_lock_free(CRYPTO_RWLOCK *lock)
     if (lock == NULL)
         return;
 
-#ifdef OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK
+# ifdef USE_RWLOCK
     pthread_rwlock_destroy(lock);
-#else
+# else
     pthread_mutex_destroy(lock);
-#endif
+# endif
     OPENSSL_free(lock);
 
     return;
@@ -168,4 +175,22 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
     return 1;
 }
 
+# ifdef OPENSSL_SYS_UNIX
+static pthread_once_t fork_once_control = PTHREAD_ONCE_INIT;
+
+static void fork_once_func(void)
+{
+    pthread_atfork(OPENSSL_fork_prepare,
+                   OPENSSL_fork_parent, OPENSSL_fork_child);
+}
+# endif
+
+int openssl_init_fork_handlers(void)
+{
+# ifdef OPENSSL_SYS_UNIX
+    if (pthread_once(&fork_once_control, fork_once_func) == 0)
+        return 1;
+# endif
+    return 0;
+}
 #endif