blob: 6d70b323d1c9b20a7b57b11f8fcbe7c6b253e58e [file] [log] [blame]
Patrick Williams864cc432023-02-09 14:54:44 -06001From 7725e7bfe6f2ce8146b6552b44e0d226be7638e7 Mon Sep 17 00:00:00 2001
2From: Pauli <pauli@openssl.org>
3Date: Fri, 11 Nov 2022 09:40:19 +1100
4Subject: [PATCH] x509: fix double locking problem
5
6This reverts commit 9aa4be691f5c73eb3c68606d824c104550c053f7 and removed the
7redundant flag setting.
8
9Fixes #19643
10
11Fixes LOW CVE-2022-3996
12
13Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
14Reviewed-by: Tomas Mraz <tomas@openssl.org>
15(Merged from https://github.com/openssl/openssl/pull/19652)
16
17(cherry picked from commit 4d0340a6d2f327700a059f0b8f954d6160f8eef5)
18
19Upstream-Status: Backport [https://github.com/openssl/openssl/commit/7725e7bfe6f2ce8146b6552b44e0d226be7638e7]
20CVE: CVE-2022-3996
21Signed-off-by: Vivek Kumbhar <vkumbhar@mvista.com>
22---
23 crypto/x509/pcy_map.c | 4 ----
24 1 file changed, 4 deletions(-)
25
26diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c
27index 05406c6493..60dfd1e320 100644
28--- a/crypto/x509/pcy_map.c
29+++ b/crypto/x509/pcy_map.c
30@@ -73,10 +73,6 @@ int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps)
31
32 ret = 1;
33 bad_mapping:
34- if (ret == -1 && CRYPTO_THREAD_write_lock(x->lock)) {
35- x->ex_flags |= EXFLAG_INVALID_POLICY;
36- CRYPTO_THREAD_unlock(x->lock);
37- }
38 sk_POLICY_MAPPING_pop_free(maps, POLICY_MAPPING_free);
39 return ret;
40
41--
422.30.2
43