From: Neil Horman <nhorman@openssl.org>
Date: Tue, 17 Jun 2025 14:53:58 +0000 (-0400)
Subject: Check setting of master key value
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ed9a38a906fff536193d1bf686bec15501df6e9;p=thirdparty%2Fopenssl.git

Check setting of master key value

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27794)
---

diff --git a/crypto/threads_common.c b/crypto/threads_common.c
index b47aae17f82..d5ef08413da 100644
--- a/crypto/threads_common.c
+++ b/crypto/threads_common.c
@@ -358,7 +358,10 @@ int CRYPTO_THREAD_set_local_ex(CRYPTO_THREAD_LOCAL_KEY_ID id,
         /*
          * make sure to assign it to our master key thread-local storage
          */
-        CRYPTO_THREAD_set_local(&master_key, mkey);
+        if (!CRYPTO_THREAD_set_local(&master_key, mkey)) {
+            OPENSSL_free(mkey);
+            return 0;
+        }
     }
 
     /*