summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorPauli <pauli@openssl.org>2022-11-11 09:40:19 +1100
committerTomas Mraz <tomas@openssl.org>2022-12-08 11:10:58 +0100
commit4d0340a6d2f327700a059f0b8f954d6160f8eef5 (patch)
treeb6a41b80f413c3b230da93ab54d8e89e9a3e4a82 /crypto
parent6c73ca4a2f4ea71f4a880670624e7b2fdb6f32da (diff)
x509: fix double locking problem
This reverts commit 9aa4be691f5c73eb3c68606d824c104550c053f7 and removed the redundant flag setting. Fixes #19643 Fixes LOW CVE-2022-3996 Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/19652)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/x509/pcy_map.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c
index 05406c6493..60dfd1e320 100644
--- a/crypto/x509/pcy_map.c
+++ b/crypto/x509/pcy_map.c
@@ -73,10 +73,6 @@ int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps)
ret = 1;
bad_mapping:
- 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;