From: Richard Levitte <levitte@openssl.org>
Date: Mon, 14 Nov 2016 22:53:45 +0000 (+0100)
Subject: Stop init loops
X-Git-Tag: OpenSSL_1_1_1-pre1~3071
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b7a7f39afeb4748b4c25dbccb8951711b8b70eaf;p=oweals%2Fopenssl.git

Stop init loops

Under certain circumstances, the libcrypto init code would loop,
causing a deadlock.  This would typically happen if something in
ossl_init_base() caused an OpenSSL error, and the error stack routines
would recurse into the init code before the flag that ossl_init_base()
had been run was checked.

This change makes sure ossl_init_base isn't run once more of the base
is initiated.

Thanks to Dmitry Kostjuchenko for the idea.

Fixes Github issue #1899

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1922)
---

diff --git a/crypto/init.c b/crypto/init.c
index e457b2dd0e..01619bc129 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -503,7 +503,7 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
         return 0;
     }
 
-    if (!RUN_ONCE(&base, ossl_init_base))
+    if (!base_inited && !RUN_ONCE(&base, ossl_init_base))
         return 0;
 
     if ((opts & OPENSSL_INIT_NO_LOAD_CRYPTO_STRINGS)