diff --git a/SOURCES/libxml2-2.12.5-CVE-2025-32415.patch b/SOURCES/libxml2-2.12.5-CVE-2025-32415.patch new file mode 100644 index 0000000..295dbb4 --- /dev/null +++ b/SOURCES/libxml2-2.12.5-CVE-2025-32415.patch @@ -0,0 +1,38 @@ +From 384cc7c182fc00c6d5e2ab4b5e3671b2e3f93c84 Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +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 + diff --git a/SOURCES/libxml2-2.9.13-CVE-2025-32414.patch b/SOURCES/libxml2-2.9.13-CVE-2025-32414.patch new file mode 100644 index 0000000..c163feb --- /dev/null +++ b/SOURCES/libxml2-2.9.13-CVE-2025-32414.patch @@ -0,0 +1,60 @@ +diff --git a/python/libxml.c b/python/libxml.c +index 5dea5026..478af305 100644 +--- a/python/libxml.c ++++ b/python/libxml.c +@@ -237,7 +237,9 @@ xmlPythonFileReadRaw (void * context, char * buffer, int len) { + #endif + file = (PyObject *) context; + if (file == NULL) return(-1); +- ret = PyEval_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 = PyEval_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) { + #endif + file = (PyObject *) context; + if (file == NULL) return(-1); +- ret = PyEval_CallMethod(file, (char *) "io_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 = PyEval_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); + } diff --git a/SPECS/libxml2.spec b/SPECS/libxml2.spec index 5cb9f25..672ef0b 100644 --- a/SPECS/libxml2.spec +++ b/SPECS/libxml2.spec @@ -1,6 +1,6 @@ Name: libxml2 Version: 2.9.13 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Library providing XML and HTML support License: MIT @@ -37,6 +37,10 @@ Patch13: libxml2-2.9.13-CVE-2025-6021.patch Patch14: libxml2-2.9.13-CVE-2025-49794.patch # https://issues.redhat.com/browse/RHEL-102806 Patch15: libxml2-2.9.13-CVE-2025-7425.patch +# https://issues.redhat.com/browse/RHEL-100182 +Patch16: libxml2-2.12.5-CVE-2025-32415.patch +# https://issues.redhat.com/browse/RHEL-99873 +Patch17: libxml2-2.9.13-CVE-2025-32414.patch BuildRequires: cmake-rpm-macros BuildRequires: gcc @@ -165,6 +169,10 @@ gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz %{python3_sitearch}/libxml2mod.so %changelog +* Tue Aug 05 2025 David King - 2.9.13-12 +- Fix CVE-2025-32415 (RHEL-100182) +- Fix CVE-2025-32414 (RHEL-99873) + * Mon Jul 21 2025 David King - 2.9.13-11 - Fix CVE-2025-7425 (RHEL-102806)