mirror of
https://git.yoctoproject.org/poky
synced 2026-03-19 13:49:41 +01:00
openssl: fix CVE-2022-3996 double locking leads to denial of service
(From OE-Core rev: ac5441f0ff6b3c33be2f62d060d9cf03458a51c4) Signed-off-by: Vivek Kumbhar <vkumbhar@mvista.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
cbd2312210
commit
f4153b1dc4
@@ -0,0 +1,43 @@
|
||||
From 7725e7bfe6f2ce8146b6552b44e0d226be7638e7 Mon Sep 17 00:00:00 2001
|
||||
From: Pauli <pauli@openssl.org>
|
||||
Date: Fri, 11 Nov 2022 09:40:19 +1100
|
||||
Subject: [PATCH] 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)
|
||||
|
||||
(cherry picked from commit 4d0340a6d2f327700a059f0b8f954d6160f8eef5)
|
||||
|
||||
Upstream-Status: Backport [https://github.com/openssl/openssl/commit/7725e7bfe6f2ce8146b6552b44e0d226be7638e7]
|
||||
CVE: CVE-2022-3996
|
||||
Signed-off-by: Vivek Kumbhar <vkumbhar@mvista.com>
|
||||
---
|
||||
crypto/x509/pcy_map.c | 4 ----
|
||||
1 file changed, 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;
|
||||
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -12,6 +12,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
|
||||
file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \
|
||||
file://afalg.patch \
|
||||
file://0001-Configure-do-not-tweak-mips-cflags.patch \
|
||||
file://CVE-2022-3996.patch \
|
||||
"
|
||||
|
||||
SRC_URI:append:class-nativesdk = " \
|
||||
|
||||
Reference in New Issue
Block a user