From d1cbdebdffd7546b2285ce996d8aad55e641c9af Mon Sep 17 00:00:00 2001
From: wh02252983 <wh02252983@alibaba-inc.com>
Date: Mon, 22 Sep 2025 14:51:01 +0800
Subject: [PATCH] [CVE] add patch to fix CVE-2024-0727 To # N/A add patch to
 fix CVE-2024-0727 Project: TC2024080204 Signed-off-by: wh02252983
 <wh02252983@alibaba-inc.com>

---
 0001-fix-CVE-2024-0727.patch | 97 ++++++++++++++++++++++++++++++++++++
 openssl1.1.spec              |  8 ++-
 2 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 0001-fix-CVE-2024-0727.patch

diff --git a/0001-fix-CVE-2024-0727.patch b/0001-fix-CVE-2024-0727.patch
new file mode 100644
index 0000000..721aced
--- /dev/null
+++ b/0001-fix-CVE-2024-0727.patch
@@ -0,0 +1,97 @@
+diff --git a/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c
+index af184c86af..9b40e5384e 100644
+--- a/crypto/pkcs12/p12_add.c
++++ b/crypto/pkcs12/p12_add.c
+@@ -76,6 +76,12 @@ STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7data(PKCS7 *p7)
+                   PKCS12_R_CONTENT_TYPE_NOT_DATA);
+         return NULL;
+     }
++
++    if (p7->d.data == NULL) {
++        PKCS12err(PKCS12_F_PKCS12_UNPACK_P7DATA, PKCS12_R_DECODE_ERROR);
++        return NULL;
++    }
++
+     return ASN1_item_unpack(p7->d.data, ASN1_ITEM_rptr(PKCS12_SAFEBAGS));
+ }
+ 
+@@ -132,6 +138,11 @@ STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass,
+ {
+     if (!PKCS7_type_is_encrypted(p7))
+         return NULL;
++
++    if (p7->d.encrypted == NULL) {
++        return NULL;
++    }
++
+     return PKCS12_item_decrypt_d2i(p7->d.encrypted->enc_data->algorithm,
+                                    ASN1_ITEM_rptr(PKCS12_SAFEBAGS),
+                                    pass, passlen,
+@@ -159,6 +170,11 @@ STACK_OF(PKCS7) *PKCS12_unpack_authsafes(const PKCS12 *p12)
+                   PKCS12_R_CONTENT_TYPE_NOT_DATA);
+         return NULL;
+     }
++    if (p12->authsafes->d.data == NULL) {
++        PKCS12err(PKCS12_F_PKCS12_UNPACK_AUTHSAFES, PKCS12_R_DECODE_ERROR);
++        return NULL;
++    }
++
+     return ASN1_item_unpack(p12->authsafes->d.data,
+                             ASN1_ITEM_rptr(PKCS12_AUTHSAFES));
+ }
+diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c
+index 3658003fe5..766c9c1e9d 100644
+--- a/crypto/pkcs12/p12_mutl.c
++++ b/crypto/pkcs12/p12_mutl.c
+@@ -93,6 +93,11 @@ static int pkcs12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
+         return 0;
+     }
+ 
++    if (p12->authsafes->d.data == NULL) {
++        PKCS12err(PKCS12_F_PKCS12_GEN_MAC, PKCS12_R_DECODE_ERROR);
++        return 0;
++    }
++
+     salt = p12->mac->salt->data;
+     saltlen = p12->mac->salt->length;
+     if (!p12->mac->iter)
+diff --git a/crypto/pkcs12/p12_npas.c b/crypto/pkcs12/p12_npas.c
+index 0334289a89..130337638d 100644
+--- a/crypto/pkcs12/p12_npas.c
++++ b/crypto/pkcs12/p12_npas.c
+@@ -78,8 +78,9 @@ static int newpass_p12(PKCS12 *p12, const char *oldpass, const char *newpass)
+             bags = PKCS12_unpack_p7data(p7);
+         } else if (bagnid == NID_pkcs7_encrypted) {
+             bags = PKCS12_unpack_p7encdata(p7, oldpass, -1);
+-            if (!alg_get(p7->d.encrypted->enc_data->algorithm,
+-                         &pbe_nid, &pbe_iter, &pbe_saltlen))
++            if (p7->d.encrypted == NULL
++                    || !alg_get(p7->d.encrypted->enc_data->algorithm,
++                                &pbe_nid, &pbe_iter, &pbe_saltlen))
+                 goto err;
+         } else {
+             continue;
+diff --git a/crypto/pkcs7/pk7_mime.c b/crypto/pkcs7/pk7_mime.c
+index 19e6868148..b457108c94 100644
+--- a/crypto/pkcs7/pk7_mime.c
++++ b/crypto/pkcs7/pk7_mime.c
+@@ -30,10 +30,14 @@ int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags)
+ {
+     STACK_OF(X509_ALGOR) *mdalgs;
+     int ctype_nid = OBJ_obj2nid(p7->type);
+-    if (ctype_nid == NID_pkcs7_signed)
++
++    if (ctype_nid == NID_pkcs7_signed) {
++        if (p7->d.sign == NULL)
++            return 0;
+         mdalgs = p7->d.sign->md_algs;
+-    else
++    } else {
+         mdalgs = NULL;
++    }
+ 
+     flags ^= SMIME_OLDMIME;
+ 
+-- 
+2.28.0.1
+
diff --git a/openssl1.1.spec b/openssl1.1.spec
index a5ffc81..517bf3e 100644
--- a/openssl1.1.spec
+++ b/openssl1.1.spec
@@ -1,4 +1,4 @@
-%define anolis_release 6
+%define anolis_release 7
 %bcond_without devel
 %define soversion 1.1
 %global _performance_build 1
@@ -35,6 +35,9 @@ BuildRequires: perl(File::Compare)
 BuildRequires: perl(File::Copy)
 Conflicts: openssl-libs < 1:3.0
 
+# https://github.com/openssl/openssl/commit/041962b429ebe748c8b6b7922980dfb6decfef26 
+Patch0001: 0001-fix-CVE-2024-0727.patch
+
 Patch1001: openssl-1.1.1-build.patch
 Patch1002: openssl-1.1.1-defaults.patch
 Patch1003: openssl-1.1.1-no-html.patch
@@ -282,6 +285,9 @@ rm -rf %{buildroot}/%{_libdir}/pkgconfig
 %ldconfig_scriptlets
 
 %changelog
+* Mon Sep 22 2025 wh02252983 <wh02252983@alibaba-inc.com> - 1:1.1.1q-7
+- Add patch to fix CVE-2024-0727
+
 * Tue Sep 9 2025 yangxinyu <yangxinyu@nfschina.com> - 1:1.1.1q-6
 - fix cve-2022-4450 cve-2023-0215
 
-- 
Gitee