packages/libxml2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix CVE-2025-32414

Browse Source
This commit is contained in:
Funda Wang 2025-05-14 17:43:00 +08:00
parent 6016838954
commit 36f2916558
2 changed files with 74 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
backport-CVE-2025-32414.patch Normal file
View File

@ -0,0 +1,66 @@
From: Maks Verver <maks@verver.ch>
Date: Tue, 8 Apr 2025 13:13:55 +0200
Subject: [PATCH 2/2] [CVE-2025-32414] python: Read at most len/4 characters.
Fixes #889 by reserving space in the buffer for UTF-8 encoding of text.
Index: libxml2-2.9.10+dfsg/python/libxml.c
===================================================================
--- libxml2-2.9.10+dfsg.orig/python/libxml.c 2025-04-28 12:34:16.797639445 +0200
+++ libxml2-2.9.10+dfsg/python/libxml.c 2025-04-28 12:34:16.793639446 +0200
@@ -286,7 +286,9 @@
#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);
@@ -321,10 +323,12 @@
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);
}
@@ -351,7 +355,9 @@
#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);
@@ -386,10 +392,12 @@
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);
}

9
libxml2.spec
View File

@ -1,7 +1,7 @@
Summary: Library providing XML and HTML support
Name: libxml2
Version: 2.9.14
Release: 16
Release: 17
License: MIT
Group: Development/Libraries
Source: https://download.gnome.org/sources/%{name}/2.9/%{name}-%{version}.tar.xz
@ -228,6 +228,7 @@ Patch6203: backport-CVE-2024-56171.patch
Patch6204: backport-CVE-2025-24928.patch
Patch6205: backport-CVE-2025-27113.patch
Patch6206: backport-CVE-2025-32415.patch
Patch6207: backport-CVE-2025-32414.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: python3-devel
@ -385,6 +386,12 @@ rm -fr %{buildroot}
%changelog
* Wed May 14 2025 Funda Wang <fundawang@yeah.net> - 2.9.14-17
- Type:CVE
- CVE:CVE-2025-32414
- SUG:NA
- DESC: fix CVE-2025-32414
* Fri Apr 18 2025 Funda Wang <fundawang@yeah.net> - 2.9.14-16
- Type:CVE
- CVE:CVE-2025-32415