diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-08-04 08:16:38 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-08-04 08:16:38 -0400 |
| commit | 0832787e5c463c713d8f24fdec0f52900ff1c2bd (patch) | |
| tree | 5ce20bef711d0d85a22cd041758278d7c176b0f3 /gnu/packages/patches/expat-CVE-2015-1283-refix.patch | |
| parent | 5b098cc4b937c05d6f685772c66e2aa04490710a (diff) | |
| download | guix-0832787e5c463c713d8f24fdec0f52900ff1c2bd.tar.gz guix-0832787e5c463c713d8f24fdec0f52900ff1c2bd.zip | |
Revert "Merge branch 'core-updates'"
This reverts commit 455859a50f88f625d13fc2f304111f02369b366b.
Diffstat (limited to 'gnu/packages/patches/expat-CVE-2015-1283-refix.patch')
| -rw-r--r-- | gnu/packages/patches/expat-CVE-2015-1283-refix.patch | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/gnu/packages/patches/expat-CVE-2015-1283-refix.patch b/gnu/packages/patches/expat-CVE-2015-1283-refix.patch index fc8d6291f5..af5e3bcc3e 100644 --- a/gnu/packages/patches/expat-CVE-2015-1283-refix.patch +++ b/gnu/packages/patches/expat-CVE-2015-1283-refix.patch @@ -1,39 +1,42 @@ -Follow-up upstream fix for CVE-2015-1283 to not rely on undefined -behavior. +Update previous fix for CVE-2015-1283 to not rely on undefined behavior. -Adapted from a patch from Debian (found in Debian package version -2.1.0-6+deb8u2) to apply to upstream code: +Copied from Debian, as found in Debian package version 2.1.0-6+deb8u2. https://sources.debian.net/src/expat/2.1.0-6%2Bdeb8u2/debian/patches/CVE-2015-1283-refix.patch/ +From 29a11774d8ebbafe8418b4a5ffb4cc1160b194a1 Mon Sep 17 00:00:00 2001 +From: Pascal Cuoq <cuoq@trust-in-soft.com> +Date: Sun, 15 May 2016 09:05:46 +0200 +Subject: [PATCH] Avoid relying on undefined behavior in CVE-2015-1283 fix. + --- - lib/xmlparse.c | 6 ++++-- + expat/lib/xmlparse.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/xmlparse.c b/lib/xmlparse.c -index 0f6f4cd..5c70c17 100644 +index 13e080d..cdb12ef 100644 --- a/lib/xmlparse.c +++ b/lib/xmlparse.c -@@ -1727,7 +1727,8 @@ XML_GetBuffer(XML_Parser parser, int len) +@@ -1695,7 +1695,8 @@ XML_GetBuffer(XML_Parser parser, int len } if (len > bufferLim - bufferEnd) { - int neededSize = len + (int)(bufferEnd - bufferPtr); + /* Do not invoke signed arithmetic overflow: */ + int neededSize = (int) ((unsigned)len + (unsigned)(bufferEnd - bufferPtr)); + /* BEGIN MOZILLA CHANGE (sanity check neededSize) */ if (neededSize < 0) { errorCode = XML_ERROR_NO_MEMORY; - return NULL; -@@ -1759,7 +1760,8 @@ XML_GetBuffer(XML_Parser parser, int len) +@@ -1729,7 +1730,8 @@ XML_GetBuffer(XML_Parser parser, int len if (bufferSize == 0) bufferSize = INIT_BUFFER_SIZE; do { - bufferSize *= 2; + /* Do not invoke signed arithmetic overflow: */ + bufferSize = (int) (2U * (unsigned) bufferSize); + /* BEGIN MOZILLA CHANGE (prevent infinite loop on overflow) */ } while (bufferSize < neededSize && bufferSize > 0); - if (bufferSize <= 0) { - errorCode = XML_ERROR_NO_MEMORY; + /* END MOZILLA CHANGE */ -- -2.8.3 +2.8.2 |