Skip to content

Commit 6b08f71

Browse files
[AUTO-CHERRYPICK] [AutoPR- Security] Patch gnutls for CVE-2025-32990, CVE-2025-32989, CVE-2025-32988 - branch 3.0-dev (microsoft#14289)
Co-authored-by: Azure Linux Security Servicing Account <[email protected]>
1 parent 7b49a3c commit 6b08f71

File tree

4 files changed

+104
-1
lines changed

4 files changed

+104
-1
lines changed

SPECS/gnutls/CVE-2025-32988.patch

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
From aee5e661655a57617e7c1742440acd802ed15d5e Mon Sep 17 00:00:00 2001
2+
From: Azure Linux Security Servicing Account
3+
4+
Date: Mon, 14 Jul 2025 13:55:55 +0000
5+
Subject: [PATCH] Fix CVE CVE-2025-32988 in gnutls
6+
7+
Upstream Patch Reference: https://gitlab.com/gnutls/gnutls/-/commit/608829769cbc247679ffe98841109fc73875e573.patch
8+
---
9+
lib/x509/extensions.c | 2 --
10+
1 file changed, 2 deletions(-)
11+
12+
diff --git a/lib/x509/extensions.c b/lib/x509/extensions.c
13+
index 6c2da8f..e8be12e 100644
14+
--- a/lib/x509/extensions.c
15+
+++ b/lib/x509/extensions.c
16+
@@ -754,7 +754,6 @@ int _gnutls_write_new_othername(asn1_node ext, const char *ext_name,
17+
result = asn1_write_value(ext, name2, oid, 1);
18+
if (result != ASN1_SUCCESS) {
19+
gnutls_assert();
20+
- asn1_delete_structure(&ext);
21+
return _gnutls_asn2err(result);
22+
}
23+
24+
@@ -763,7 +762,6 @@ int _gnutls_write_new_othername(asn1_node ext, const char *ext_name,
25+
result = asn1_write_value(ext, name2, data, data_size);
26+
if (result != ASN1_SUCCESS) {
27+
gnutls_assert();
28+
- asn1_delete_structure(&ext);
29+
return _gnutls_asn2err(result);
30+
}
31+
32+
--
33+
2.45.3
34+

SPECS/gnutls/CVE-2025-32989.patch

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From 8bd8fed8a12f671eb479776196ac02098a179083 Mon Sep 17 00:00:00 2001
2+
From: Azure Linux Security Servicing Account
3+
4+
Date: Mon, 14 Jul 2025 13:56:14 +0000
5+
Subject: [PATCH] Fix CVE CVE-2025-32989 in gnutls
6+
7+
Upstream Patch Reference: https://gitlab.com/gnutls/gnutls/-/commit/8e5ca951257202089246fa37e93a99d210ee5ca2.patch
8+
---
9+
lib/x509/x509_ext.c | 2 +-
10+
1 file changed, 1 insertion(+), 1 deletion(-)
11+
12+
diff --git a/lib/x509/x509_ext.c b/lib/x509/x509_ext.c
13+
index 064ca83..05336a0 100644
14+
--- a/lib/x509/x509_ext.c
15+
+++ b/lib/x509/x509_ext.c
16+
@@ -3757,7 +3757,7 @@ int gnutls_x509_ext_ct_import_scts(const gnutls_datum_t *ext,
17+
}
18+
19+
length = _gnutls_read_uint16(scts_content.data);
20+
- if (length < 4) {
21+
+ if (length < 4 || length > scts_content.size) {
22+
gnutls_free(scts_content.data);
23+
return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
24+
}
25+
--
26+
2.45.3
27+

SPECS/gnutls/CVE-2025-32990.patch

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
From bdc30f568829c08f52705ee60ad4914502345d29 Mon Sep 17 00:00:00 2001
2+
From: Azure Linux Security Servicing Account
3+
4+
Date: Mon, 14 Jul 2025 13:56:33 +0000
5+
Subject: [PATCH] Fix CVE CVE-2025-32990 in gnutls
6+
7+
Upstream Patch Reference: https://gitlab.com/gnutls/gnutls/-/commit/8a36455fd75ce76391cfc00c53213d8b0e1648da.patch
8+
---
9+
src/certtool-cfg.c | 4 ++--
10+
1 file changed, 2 insertions(+), 2 deletions(-)
11+
12+
diff --git a/src/certtool-cfg.c b/src/certtool-cfg.c
13+
index 2d7a1dc..bce2390 100644
14+
--- a/src/certtool-cfg.c
15+
+++ b/src/certtool-cfg.c
16+
@@ -257,7 +257,7 @@ void cfg_init(void)
17+
if (val != NULL) { \
18+
if (s_name == NULL) { \
19+
i = 0; \
20+
- s_name = malloc(sizeof(char *) * MAX_ENTRIES); \
21+
+ s_name = calloc(MAX_ENTRIES + 1, sizeof(char *)); \
22+
CHECK_MALLOC(s_name); \
23+
do { \
24+
if (val && strcmp(val->name, k_name) != 0) \
25+
@@ -279,7 +279,7 @@ void cfg_init(void)
26+
char *p; \
27+
if (s_name == NULL) { \
28+
i = 0; \
29+
- s_name = malloc(sizeof(char *) * MAX_ENTRIES); \
30+
+ s_name = calloc(MAX_ENTRIES + 1, sizeof(char *)); \
31+
CHECK_MALLOC(s_name); \
32+
do { \
33+
if (val && strcmp(val->name, k_name) != 0) \
34+
--
35+
2.45.3
36+

SPECS/gnutls/gnutls.spec

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: The GnuTLS Transport Layer Security Library
22
Name: gnutls
33
Version: 3.8.3
4-
Release: 4%{?dist}
4+
Release: 5%{?dist}
55
License: GPLv3+ AND LGPLv2.1+
66
Vendor: Microsoft Corporation
77
Distribution: Azure Linux
@@ -14,6 +14,9 @@ Patch1: CVE-2024-28834.patch
1414
Patch2: CVE-2024-28835.patch
1515
Patch3: CVE-2024-12133.patch
1616
Patch4: CVE-2024-12243.patch
17+
Patch5: CVE-2025-32990.patch
18+
Patch6: CVE-2025-32989.patch
19+
Patch7: CVE-2025-32988.patch
1720
BuildRequires: autogen-libopts-devel
1821
BuildRequires: gc-devel
1922
BuildRequires: libtasn1-devel
@@ -95,6 +98,9 @@ sed -i 's/TESTS += test-ciphers-openssl.sh//' tests/slow/Makefile.am
9598
%{_mandir}/man3/*
9699

97100
%changelog
101+
* Mon Jul 14 2025 Azure Linux Security Servicing Account <[email protected]> - 3.8.3-5
102+
- Patch for CVE-2025-32990, CVE-2025-32989, CVE-2025-32988
103+
98104
* Tue Mar 11 2025 Sreeniavsulu Malavathula <[email protected]> - 3.8.3-4
99105
- Patch CVE-2024-12243
100106

0 commit comments

Comments
 (0)