git: upgrade to 2.39.1
PATCH 1/3 git: upgrade to 2.39.1
This fixes CVE-2022-41903 and CVE-2022-23521.
Signed-off-by Ross Burton <[email protected]>
---
meta/recipes-devtools/git/{git_2.39.0.bb => git_2.39.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/git/{git_2.39.0.bb => git_2.39.1.bb} (98%)meta/recipes-devtools/git/git_2.39.1.bb renamed from meta/recipes-devtools/git/git_2.39.0.bb +1 -1
@@ -166,4 +166,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "d929fe67cef7ac3ca709d2b56a9920f17112d5a524bf8112af37ec045a7a5109" +SRC_URI[tarball.sha256sum] = "ae8d3427e4ccd677abc931f16183c0ec953e3bfcd866493601351e04a2b97398"
Signature · 1 line
2.34.1
PATCH 2/3 git: ignore CVE-2022-41953
This is specific to Git-for-Windows.
Signed-off-by Ross Burton <[email protected]>
--- meta/recipes-devtools/git/git_2.39.1.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-devtools/git/git_2.39.1.bb +2 -0
@@ -31,6 +31,8 @@ CVE_PRODUCT = "git-scm:git" # in mirrored git repos. Most OE users wouldn't build the docs and # we don't see this as a major issue for our general users/usecases. CVE_CHECK_IGNORE += "CVE-2022-24975" +# This is specific to Git-for-Windows +CVE_CHECK_IGNORE += "CVE-2022-41953" PACKAGECONFIG ??= "expat curl" PACKAGECONFIG[cvsserver] = ""
Signature · 1 line
2.34.1
PATCH 3/3 openssl: fix CVE-2022-3996 double locking leads to denial of service
In reply to Ross BurtonFrom: Vivek Kumbhar <[email protected]>
Signed-off-by Vivek Kumbhar <[email protected]>
--- .../openssl/openssl/CVE-2022-3996.patch | 43 +++++++++++++++++++ .../openssl/openssl_3.0.7.bb | 1 + 2 files changed, 44 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch
meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch new file +43 -0
@@ -0,0 +1,43 @@ +From 7725e7bfe6f2ce8146b6552b44e0d226be7638e7 Mon Sep 17 00:00:00 2001 +From: Pauli <[email protected]> +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 <[email protected]> +Reviewed-by: Tomas Mraz <[email protected]> +(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 <[email protected]> +--- + 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 +
meta/recipes-connectivity/openssl/openssl_3.0.7.bb +1 -0
@@ -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 = " \
Signature · 1 line
2.34.1