From 2b6d9d24e72b5546f8a86f9019e47dbc1ec43c35 Mon Sep 17 00:00:00 2001 From: maoyanping Date: Thu, 17 Apr 2025 18:13:51 +0800 Subject: [PATCH] fix CVE-2025-32414 reference:https://gitee.com/src-openeuler/libxml2/pulls/280 Signed-off-by: maoyanping --- backport-CVE-2025-32414.patch | 73 +++++++++++++++++++++++++++++++++++ libxml2.spec | 6 ++- 2 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 backport-CVE-2025-32414.patch diff --git a/backport-CVE-2025-32414.patch b/backport-CVE-2025-32414.patch new file mode 100644 index 0000000..7283412 --- /dev/null +++ b/backport-CVE-2025-32414.patch @@ -0,0 +1,73 @@ +From d7657811964eac1cb9743bb98649278ad948f0d2 Mon Sep 17 00:00:00 2001 +From: Maks Verver +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 1fe8d6850..2bf140786 100644 +--- a/python/libxml.c ++++ b/python/libxml.c +@@ -266,7 +266,9 @@ xmlPythonFileReadRaw (void * context, char * buffer, int len) { + #endif + 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); +@@ -301,10 +303,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); + } +@@ -331,7 +335,9 @@ xmlPythonFileRead (void * context, char * buffer, int len) { + #endif + 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); +@@ -366,10 +372,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 + diff --git a/libxml2.spec b/libxml2.spec index 9f5be1d..7260205 100644 --- a/libxml2.spec +++ b/libxml2.spec @@ -1,7 +1,7 @@ Summary: Library providing XML and HTML support Name: libxml2 Version: 2.11.9 -Release: 2 +Release: 3 License: MIT Group: Development/Libraries Source: https://download.gnome.org/sources/%{name}/2.11/%{name}-%{version}.tar.xz @@ -13,6 +13,7 @@ Patch3: backport-examples-Don-t-call-xmlCleanupParser-and-xmlMemoryDu.patch Patch4: backport-CVE-2024-56171.patch Patch5: backport-CVE-2025-24928.patch Patch6: backport-CVE-2025-27113.patch +Patch7: backport-CVE-2025-32414.patch BuildRequires: python3-devel BuildRequires: zlib-devel @@ -150,6 +151,9 @@ gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz %changelog +* Thu Apr 17 2025 maoyanping -2.11.9-3 +- fix CVE-2025-32414 + * Wed Feb 19 2025 Funda Wang - 2.11.9-2 - fix CVE-2024-56171, CVE-2025-24928, CVE-2025-27113 -- Gitee