rpms/libxml2
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix CVE-2025-32414 (RHEL-99873)

Browse Source 
Resolves: RHEL-99873
This commit is contained in:
David King 2025-08-05 17:55:22 +01:00
parent 7b50df77c1
commit 56e5f738b3
2 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
libxml2-2.9.13-CVE-2025-32414.patch Normal file
View File

@ -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);
}

3
libxml2.spec
View File

@ -39,6 +39,8 @@ Patch14: libxml2-2.9.13-CVE-2025-49794.patch
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
@ -169,6 +171,7 @@ gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz
%changelog
* Tue Aug 05 2025 David King <dking@redhat.com> - 2.9.13-12
- Fix CVE-2025-32415 (RHEL-100182)
- Fix CVE-2025-32414 (RHEL-99873)
* Mon Jul 21 2025 David King <dking@redhat.com> - 2.9.13-11
- Fix CVE-2025-7425 (RHEL-102806)