From: Richard Levitte <levitte@openssl.org>
Date: Mon, 6 Oct 2003 09:09:44 +0000 (+0000)
Subject: Setting the ex_data index is unsafe in a threaded environment, so
X-Git-Tag: BEN_FIPS_TEST_4^2~11^2~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c40b9bdefb59be7e640cd7a10bfd2fa26ea1fe7b;p=thirdparty%2Fopenssl.git

Setting the ex_data index is unsafe in a threaded environment, so
let's wrap it with a lock.
---

diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index c3167fcead0..7553a2d107e 100644
--- a/crypto/comp/c_zlib.c
+++ b/crypto/comp/c_zlib.c
@@ -178,9 +178,12 @@ static int zlib_stateful_init(COMP_CTX *ctx)
 	CRYPTO_new_ex_data(CRYPTO_EX_INDEX_COMP,ctx,&ctx->ex_data);
 	if (zlib_stateful_ex_idx == -1)
 		{
-		zlib_stateful_ex_idx =
-			CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_COMP,
-				0,NULL,NULL,NULL,zlib_stateful_free_ex_data);
+		CRYPTO_w_lock(CRYPTO_LOCK_COMP);
+		if (zlib_stateful_ex_idx == -1)
+			zlib_stateful_ex_idx =
+				CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_COMP,
+					0,NULL,NULL,NULL,zlib_stateful_free_ex_data);
+		CRYPTO_w_unlock(CRYPTO_LOCK_COMP);
 		if (zlib_stateful_ex_idx == -1)
 			goto err;
 		}
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 9c38f15ab2b..009c3be4c0a 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -168,7 +168,8 @@ static const char* lock_names[CRYPTO_NUM_LOCKS] =
 	"bn",
 	"ec_pre_comp",
 	"store",
-#if CRYPTO_NUM_LOCKS != 38
+	"comp",
+#if CRYPTO_NUM_LOCKS != 39
 # error "Inconsistency between crypto.h and cryptlib.c"
 #endif
 	};
diff --git a/crypto/crypto.h b/crypto/crypto.h
index dd90cfa55d0..5238e530669 100644
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -203,7 +203,8 @@ typedef struct openssl_item_st
 #define CRYPTO_LOCK_BN  		35
 #define CRYPTO_LOCK_EC_PRE_COMP		36
 #define CRYPTO_LOCK_STORE		37
-#define CRYPTO_NUM_LOCKS		38
+#define CRYPTO_LOCK_COMP		38
+#define CRYPTO_NUM_LOCKS		39
 
 #define CRYPTO_LOCK		1
 #define CRYPTO_UNLOCK		2