From: Pauli <ppzgs1@gmail.com>
Date: Tue, 23 Mar 2021 00:35:13 +0000 (+1000)
Subject: x509: fix coverity 1474424: data race condition
X-Git-Tag: openssl-3.0.0-alpha14~142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9aa4be691f5c73eb3c68606d824c104550c053f7;p=thirdparty%2Fopenssl.git

x509: fix coverity 1474424: data race condition

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14651)
---

diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c
index b599ff98048..d129eca4c39 100644
--- a/crypto/x509/pcy_map.c
+++ b/crypto/x509/pcy_map.c
@@ -73,8 +73,10 @@ int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps)
 
     ret = 1;
  bad_mapping:
-    if (ret == -1)
+    if (ret == -1 && CRYPTO_THREAD_write_lock(x->lock)) {
         x->ex_flags |= EXFLAG_INVALID_POLICY;
+        CRYPTO_THREAD_unlock(x->lock);
+    }
     sk_POLICY_MAPPING_pop_free(maps, POLICY_MAPPING_free);
     return ret;