From f187ad56ca6be6f38fb3310f356deb84e987bd24 Mon Sep 17 00:00:00 2001 From: tomcruiseqi <10762123+tomcruiseqi@user.noreply.gitee.com> Date: Mon, 14 Apr 2025 16:37:57 +0800 Subject: [PATCH] [CVE] FIX CVE-2025-32414 to #20223 add patch to fix CVE-2025-32414 Project: TC2024080204 Signed-off-by: tomcruiseqi <10762123+tomcruiseqi@user.noreply.gitee.com> --- bugfix-for-cve-2025-32414.patch | 73 +++++++++++++++++++++++++++++++++ libxml2.spec | 9 +++- 2 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 bugfix-for-cve-2025-32414.patch diff --git a/bugfix-for-cve-2025-32414.patch b/bugfix-for-cve-2025-32414.patch new file mode 100644 index 0000000..a5734a1 --- /dev/null +++ b/bugfix-for-cve-2025-32414.patch @@ -0,0 +1,73 @@ +From 8d415b8911be26b12b85497f7cc57143b5321787 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 5dea50260..0a1e408bd 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 1f81a91..2970900 100644 --- a/libxml2.spec +++ b/libxml2.spec @@ -1,4 +1,4 @@ -%define anolis_release 5 +%define anolis_release 6 Name: libxml2 Version: 2.11.5 Release: %{anolis_release}%{?dist} @@ -26,6 +26,10 @@ Patch4: Bugfix-for-CVE-2024-25062.patch # Upstream fix: https://gitlab.gnome.org/GNOME/libxml2/-/commit/ae8f0ac0a2900219c3d762ae0b513e199dcf19a5 Patch5: 1001-fix-CVE-2024-40896.patch +# CVE-2025-32414 +# Upstream fix: https://gitlab.gnome.org/GNOME/libxml2/-/commit/8d415b8911be26b12b85497f7cc57143b5321787 +Patch6: bugfix-for-cve-2025-32414.patch + BuildRequires: cmake-rpm-macros BuildRequires: gcc BuildRequires: make @@ -170,6 +174,9 @@ gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz %doc NEWS README.md %changelog +* Mon Apr 14 2025 qizengtian - 2.11.5-6 +- Fix CVE-2025-32414 + * Mon Jan 13 2025 mgb01105731 - 2.11.5-5 - to #IBHBVL - add patch to fix CVE-2024-40896 -- Gitee