41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From d15ba056c15db75c9153fda27a62b1a6cfb8196e Mon Sep 17 00:00:00 2001
|
|
From: Rob Crittenden <rcritten@redhat.com>
|
|
Date: Mon, 9 Sep 2024 14:35:28 -0400
|
|
Subject: [PATCH] Prevent integer overflow or wraparound CVE-2024-45491
|
|
|
|
An issue was discovered in libexpat before 2.6.3. dtdCopy in
|
|
xmlparse.c can have an integer overflow for nDefaultAtts on
|
|
32-bit platforms (where UINT_MAX equals SIZE_MAX).
|
|
|
|
Backported from upstream https://github.com/libexpat/libexpat/pull/891
|
|
|
|
Resolves: RHEL-57519
|
|
---
|
|
lib/expat/xmlparse/xmlparse.c | 10 ++++++++++
|
|
1 file changed, 10 insertions(+)
|
|
|
|
diff --git a/lib/expat/xmlparse/xmlparse.c b/lib/expat/xmlparse/xmlparse.c
|
|
index 359267a..40f753b 100644
|
|
--- a/lib/expat/xmlparse/xmlparse.c
|
|
+++ b/lib/expat/xmlparse/xmlparse.c
|
|
@@ -1020,6 +1020,16 @@ static int dtdCopy(XML_Parser oldParser, DTD *newDtd, const DTD *oldDtd)
|
|
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 *)
|
|
malloc(oldE->nDefaultAtts * sizeof(DEFAULT_ATTRIBUTE));
|
|
if (!newE->defaultAtts)
|
|
--
|
|
2.45.0
|
|
|