From: Matus Kysel <mkysel@tachyum.com>
Date: Fri, 22 Nov 2019 09:44:02 +0000 (+0100)
Subject: Remove deadlock that was caused by calling pthread_rwlock_wrlock() on same thread... 
X-Git-Tag: openssl-3.0.0-alpha1~912
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0c080f73e8fc3cf7e73a42b15011d8a0a0c8aab7;p=oweals%2Fopenssl.git

Remove deadlock that was caused by calling pthread_rwlock_wrlock() on same thread twice. This can be reproduce only with musl.

CLA: trivial

Signed-off-by: Matus Kysel <mkysel@tachyum.com>

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10501)
---

diff --git a/crypto/ex_data.c b/crypto/ex_data.c
index 9f08606d2f..58614b68a3 100644
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.c
@@ -108,7 +108,7 @@ static int dummy_dup(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
 
 int crypto_free_ex_index_ex(OPENSSL_CTX *ctx, int class_index, int idx)
 {
-    EX_CALLBACKS *ip = get_and_lock(ctx, class_index);
+    EX_CALLBACKS *ip;
     EX_CALLBACK *a;
     int toret = 0;
     OSSL_EX_DATA_GLOBAL *global = openssl_ctx_get_ex_data_global(ctx);