import UBI libxml2-2.12.5-9.el10_0

This commit is contained in:
eabdullin 2025-08-07 18:06:26 +00:00
parent cf8ed91135
commit bf062eef67
3 changed files with 120 additions and 1 deletions

View File

@ -0,0 +1,73 @@
From 443a9c89115203e5bd88fb136e256267b90cb78e Mon Sep 17 00:00:00 2001
From: Maks Verver <maks@verver.ch>
Date: Tue, 8 Apr 2025 13:13:55 +0200
Subject: [PATCH] [CVE-2025-32414] python: Read at most len/4 characters.
Fixes #889 by reserving space in the buffer for UTF-8 encoding of text.
---
python/libxml.c | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/python/libxml.c b/python/libxml.c
index 98f04b6b2..16f7c9953 100644
--- a/python/libxml.c
+++ b/python/libxml.c
@@ -237,7 +237,9 @@ xmlPythonFileReadRaw (void * context, char * buffer, int len) {
file = (PyObject *) context;
if (file == NULL) return(-1);
- ret = PyObject_CallMethod(file, (char *) "read", (char *) "(i)", len);
+ /* When read() returns a string, the length is in characters not bytes, so
+ request at most len / 4 characters to leave space for UTF-8 encoding. */
+ ret = PyObject_CallMethod(file, (char *) "read", (char *) "(i)", len / 4);
if (ret == NULL) {
printf("xmlPythonFileReadRaw: result is NULL\n");
return(-1);
@@ -272,10 +274,12 @@ xmlPythonFileReadRaw (void * context, char * buffer, int len) {
Py_DECREF(ret);
return(-1);
}
- if (lenread > len)
- memcpy(buffer, data, len);
- else
- memcpy(buffer, data, lenread);
+ if (lenread < 0 || lenread > len) {
+ printf("xmlPythonFileReadRaw: invalid lenread\n");
+ Py_DECREF(ret);
+ return(-1);
+ }
+ memcpy(buffer, data, lenread);
Py_DECREF(ret);
return(lenread);
}
@@ -299,7 +303,9 @@ xmlPythonFileRead (void * context, char * buffer, int len) {
file = (PyObject *) context;
if (file == NULL) return(-1);
- ret = PyObject_CallMethod(file, (char *) "io_read", (char *) "(i)", len);
+ /* When io_read() returns a string, the length is in characters not bytes, so
+ request at most len / 4 characters to leave space for UTF-8 encoding. */
+ ret = PyObject_CallMethod(file, (char *) "io_read", (char *) "(i)", len / 4);
if (ret == NULL) {
printf("xmlPythonFileRead: result is NULL\n");
return(-1);
@@ -334,10 +340,12 @@ xmlPythonFileRead (void * context, char * buffer, int len) {
Py_DECREF(ret);
return(-1);
}
- if (lenread > len)
- memcpy(buffer, data, len);
- else
- memcpy(buffer, data, lenread);
+ if (lenread < 0 || lenread > len) {
+ printf("xmlPythonFileRead: invalid lenread\n");
+ Py_DECREF(ret);
+ return(-1);
+ }
+ memcpy(buffer, data, lenread);
Py_DECREF(ret);
return(lenread);
}
--
GitLab

View File

@ -0,0 +1,38 @@
From 384cc7c182fc00c6d5e2ab4b5e3671b2e3f93c84 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Sun, 6 Apr 2025 12:41:11 +0200
Subject: [PATCH] [CVE-2025-32415] schemas: Fix heap buffer overflow in
xmlSchemaIDCFillNodeTables
Don't use local variable which could contain a stale value.
Fixes #890.
---
xmlschemas.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xmlschemas.c b/xmlschemas.c
index e35c117ef..4bdabd129 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
@@ -23324,7 +23324,7 @@ xmlSchemaIDCFillNodeTables(xmlSchemaValidCtxtPtr vctxt,
j++;
} while (j < nbDupls);
}
- if (nbNodeTable) {
+ if (bind->nbNodes) {
j = 0;
do {
if (nbFields == 1) {
@@ -23375,7 +23375,7 @@ xmlSchemaIDCFillNodeTables(xmlSchemaValidCtxtPtr vctxt,
next_node_table_entry:
j++;
- } while (j < nbNodeTable);
+ } while (j < bind->nbNodes);
}
/*
* If everything is fine, then add the IDC target-node to
--
GitLab

View File

@ -1,6 +1,6 @@
Name: libxml2
Version: 2.12.5
Release: 8%{?dist}
Release: 9%{?dist}
Summary: Library providing XML and HTML support
# list.c, dict.c and few others use ISC-Veillard
@ -33,6 +33,10 @@ Patch6: libxml2-2.12.5-CVE-2025-49794.patch
Patch7: libxml2-2.12.5-CVE-2025-49795.patch
# https://issues.redhat.com/browse/RHEL-102794
Patch8: libxml2-2.12.5-CVE-2025-7425.patch
# https://issues.redhat.com/browse/RHEL-100174
Patch9: libxml2-2.12.5-CVE-2025-32415.patch
# https://issues.redhat.com/browse/RHEL-99861
Patch10: libxml2-2.12.5-CVE-2025-32414.patch
BuildRequires: cmake-rpm-macros
BuildRequires: gcc
@ -173,6 +177,10 @@ popd
%{python3_sitelib}/__pycache__/drv_libxml2.*
%changelog
* Tue Aug 05 2025 David King <dking@redhat.com> - 2.12.5-9
- Fix CVE-2025-32415 (RHEL-100174)
- Fix CVE-2025-32414 (RHEL-99861)
* Mon Jul 21 2025 David King <dking@redhat.com> - 2.12.5-8
- Fix CVE-2025-7425 (RHEL-102794)