summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl
diff options
context:
space:
mode:
authorVivek Kumbhar <vkumbhar@mvista.com>2023-01-30 12:07:09 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-01 14:05:15 +0000
commit61f27971a9aa02520ece62e070822687dc652e0d (patch)
treeb547a4052c5846fb20de57b3e6cb5b92524252a9 /meta/recipes-connectivity/openssl
parent8b4d0c8cb85ffbacf978c66e71d7ff5fabb03e48 (diff)
downloadpoky-61f27971a9aa02520ece62e070822687dc652e0d.tar.gz
openssl: fix CVE-2022-3996 double locking leads to denial of service
(From OE-Core rev: c20b7b864dc6726a2ed4a40cf5a30661ad28c6e0) Signed-off-by: Vivek Kumbhar <vkumbhar@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl')
-rw-r--r--meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch43
-rw-r--r--meta/recipes-connectivity/openssl/openssl_3.0.7.bb1
2 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch
new file mode 100644
index 0000000000..6d70b323d1
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch
@@ -0,0 +1,43 @@
1From 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
diff --git a/meta/recipes-connectivity/openssl/openssl_3.0.7.bb b/meta/recipes-connectivity/openssl/openssl_3.0.7.bb
index 45fd1de2fd..1842148592 100644
--- a/meta/recipes-connectivity/openssl/openssl_3.0.7.bb
+++ b/meta/recipes-connectivity/openssl/openssl_3.0.7.bb
@@ -12,6 +12,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
12 file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ 12 file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \
13 file://afalg.patch \ 13 file://afalg.patch \
14 file://0001-Configure-do-not-tweak-mips-cflags.patch \ 14 file://0001-Configure-do-not-tweak-mips-cflags.patch \
15 file://CVE-2022-3996.patch \
15 " 16 "
16 17
17SRC_URI:append:class-nativesdk = " \ 18SRC_URI:append:class-nativesdk = " \