2024-09-04 12:40:55 -04:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Sebastian Pipping <sebastian@pipping.org>
|
|
|
|
|
Date: Mon, 19 Aug 2024 22:34:13 +0200
|
2024-09-04 19:10:33 -04:00
|
|
|
Subject: [PATCH] lib: Detect integer overflow in dtdCopy
|
2024-09-04 12:40:55 -04:00
|
|
|
|
2024-09-08 09:31:43 -04:00
|
|
|
CVE-2024-45491
|
|
|
|
|
|
2024-09-04 12:40:55 -04:00
|
|
|
Reported by TaiYou
|
2024-09-08 09:31:43 -04:00
|
|
|
|
|
|
|
|
Change-Id: Ie0e4d640a83b06d9829c742e73af3aa40116e10b
|
2024-09-04 12:40:55 -04:00
|
|
|
---
|
|
|
|
|
lib/xmlparse.c | 10 ++++++++++
|
|
|
|
|
1 file changed, 10 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/lib/xmlparse.c b/lib/xmlparse.c
|
2024-09-15 16:56:21 -04:00
|
|
|
index bd429812..c88eaeb3 100644
|
2024-09-04 12:40:55 -04:00
|
|
|
--- a/lib/xmlparse.c
|
|
|
|
|
+++ b/lib/xmlparse.c
|
2024-09-15 16:56:21 -04:00
|
|
|
@@ -6008,6 +6008,16 @@ dtdCopy(XML_Parser oldParser, DTD *newDtd, const DTD *oldDtd, const XML_Memory_H
|
2024-09-04 12:40:55 -04:00
|
|
|
if (!newE)
|
|
|
|
|
return 0;
|
|
|
|
|
if (oldE->nDefaultAtts) {
|
|
|
|
|
+ /* Detect and prevent integer overflow.
|
|
|
|
|
+ * The preprocessor guard addresses the "always false" warning
|
|
|
|
|
+ * from -Wtype-limits on platforms where
|
|
|
|
|
+ * sizeof(int) < sizeof(size_t), e.g. on x86_64. */
|
|
|
|
|
+#if UINT_MAX >= SIZE_MAX
|
|
|
|
|
+ if ((size_t)oldE->nDefaultAtts
|
|
|
|
|
+ > ((size_t)(-1) / sizeof(DEFAULT_ATTRIBUTE))) {
|
|
|
|
|
+ return 0;
|
|
|
|
|
+ }
|
|
|
|
|
+#endif
|
|
|
|
|
newE->defaultAtts = (DEFAULT_ATTRIBUTE *)
|
|
|
|
|
ms->malloc_fcn(oldE->nDefaultAtts * sizeof(DEFAULT_ATTRIBUTE));
|
|
|
|
|
if (!newE->defaultAtts) {
|
