rpms/libxml2
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix CVE-2025-24928 (RHEL-80134)

Browse Source 
Resolves: RHEL-80134
This commit is contained in:
David King 2025-02-24 13:36:34 +00:00
parent bcbd29232c
commit 59933b430c
2 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
libxml2-2.12.5-CVE-2025-24928.patch Normal file
View File

@ -0,0 +1,57 @@
From 858ca26c0689161a6b903a6682cc8a1cc10a0ea8 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Tue, 11 Feb 2025 17:30:40 +0100
Subject: [PATCH] [CVE-2025-24928] Fix stack-buffer-overflow in
xmlSnprintfElements
Fixes #847.
---
valid.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/valid.c b/valid.c
index 76d657d62..abefdc50a 100644
--- a/valid.c
+++ b/valid.c
@@ -5057,25 +5057,26 @@ xmlSnprintfElements(char *buf, int size, xmlNodePtr node, int glob) {
return;
}
switch (cur->type) {
- case XML_ELEMENT_NODE:
+ case XML_ELEMENT_NODE: {
+ int qnameLen = xmlStrlen(cur->name);
+
+ if ((cur->ns != NULL) && (cur->ns->prefix != NULL))
+ qnameLen += xmlStrlen(cur->ns->prefix) + 1;
+ if (size - len < qnameLen + 10) {
+ if ((size - len > 4) && (buf[len - 1] != '.'))
+ strcat(buf, " ...");
+ return;
+ }
if ((cur->ns != NULL) && (cur->ns->prefix != NULL)) {
- if (size - len < xmlStrlen(cur->ns->prefix) + 10) {
- if ((size - len > 4) && (buf[len - 1] != '.'))
- strcat(buf, " ...");
- return;
- }
strcat(buf, (char *) cur->ns->prefix);
strcat(buf, ":");
}
- if (size - len < xmlStrlen(cur->name) + 10) {
- if ((size - len > 4) && (buf[len - 1] != '.'))
- strcat(buf, " ...");
- return;
- }
- strcat(buf, (char *) cur->name);
+ if (cur->name != NULL)
+ strcat(buf, (char *) cur->name);
if (cur->next != NULL)
strcat(buf, " ");
break;
+ }
case XML_TEXT_NODE:
if (xmlIsBlankNode(cur))
break;
--
GitLab

3
libxml2.spec
View File

@ -22,6 +22,8 @@ Patch1: libxml2-2.12.0-python3-unicode-errors.patch
Patch2: libxml2-2.12.5-CVE-2024-40896.patch Patch2: libxml2-2.12.5-CVE-2024-40896.patch
# https://issues.redhat.com/browse/RHEL-80119 # https://issues.redhat.com/browse/RHEL-80119
Patch3: libxml2-2.12.5-CVE-2024-56171.patch Patch3: libxml2-2.12.5-CVE-2024-56171.patch
# https://issues.redhat.com/browse/RHEL-80134
Patch4: libxml2-2.12.5-CVE-2025-24928.patch
BuildRequires: cmake-rpm-macros BuildRequires: cmake-rpm-macros
BuildRequires: gcc BuildRequires: gcc
@ -164,6 +166,7 @@ popd
%changelog %changelog
* Mon Feb 24 2025 David King <dking@redhat.com> - 2.12.5-5 * Mon Feb 24 2025 David King <dking@redhat.com> - 2.12.5-5
- Fix CVE-2024-56171 (RHEL-80119) - Fix CVE-2024-56171 (RHEL-80119)
- Fix CVE-2025-24928 (RHEL-80134)
* Tue Dec 24 2024 David King <amigadave@amigadave.com> - 2.12.5-4 * Tue Dec 24 2024 David King <amigadave@amigadave.com> - 2.12.5-4
- Fix CVE-2024-40896 (RHEL-72060) - Fix CVE-2024-40896 (RHEL-72060)