summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-05-16 16:22:46 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-17 14:43:28 +0100
commitd4099e1042a71993d0368b4b846947b7a06ea742 (patch)
tree2ac22fe93f19cb00ca677880e55a0fb348d7bb82
parent169852ebc2186e23227a1b5d7d50291755f4374e (diff)
downloadpoky-d4099e1042a71993d0368b4b846947b7a06ea742.tar.gz
expat: Upgrade 2.1.0 -> 2.1.1
* Remove backported CVE patch * Update autotools patch * Update SRC_URI to match current archive type (From OE-Core rev: 8a5a90aa6a7f398803f432038d56cdfea1651aaa) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/expat/expat-2.1.0/expat-CVE-2015-1283.patch62
-rw-r--r--meta/recipes-core/expat/expat.inc3
-rw-r--r--meta/recipes-core/expat/expat/autotools.patch (renamed from meta/recipes-core/expat/expat-2.1.0/autotools.patch)4
-rw-r--r--meta/recipes-core/expat/expat_2.1.0.bb5
-rw-r--r--meta/recipes-core/expat/expat_2.1.1.bb5
5 files changed, 8 insertions, 71 deletions
diff --git a/meta/recipes-core/expat/expat-2.1.0/expat-CVE-2015-1283.patch b/meta/recipes-core/expat/expat-2.1.0/expat-CVE-2015-1283.patch
deleted file mode 100644
index 1d0acb6b91..0000000000
--- a/meta/recipes-core/expat/expat-2.1.0/expat-CVE-2015-1283.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1Multiple integer overflows in the XML_GetBuffer function in Expat
2through 2.1.0, allow remote attackers to cause a denial of service
3(heap-based buffer overflow) or possibly have unspecified other
4impact via crafted XML data.
5
6CVSSv2: (AV:N/AC:M/Au:N/C:P/I:P/A:P)
7
8CVE: CVE-2015-1283
9Upstream-Status: Backport
10
11Signed-off-by: Eric Rahm <erahm@mozilla.com>
12Signed-off-by: Zhixiong Chi <zhixiong.chi@windirver.com>
13
14Index: expat-2.1.0/lib/xmlparse.c
15===================================================================
16--- expat-2.1.0.orig/lib/xmlparse.c 2012-03-11 13:13:12.000000000 +0800
17+++ expat-2.1.0/lib/xmlparse.c 2015-12-23 10:29:07.347361329 +0800
18@@ -1678,6 +1678,12 @@
19 void * XMLCALL
20 XML_GetBuffer(XML_Parser parser, int len)
21 {
22+/* BEGIN MOZILLA CHANGE (sanity check len) */
23+ if (len < 0) {
24+ errorCode = XML_ERROR_NO_MEMORY;
25+ return NULL;
26+ }
27+/* END MOZILLA CHANGE */
28 switch (ps_parsing) {
29 case XML_SUSPENDED:
30 errorCode = XML_ERROR_SUSPENDED;
31@@ -1689,8 +1695,13 @@
32 }
33
34 if (len > bufferLim - bufferEnd) {
35- /* FIXME avoid integer overflow */
36 int neededSize = len + (int)(bufferEnd - bufferPtr);
37+/* BEGIN MOZILLA CHANGE (sanity check neededSize) */
38+ if (neededSize < 0) {
39+ errorCode = XML_ERROR_NO_MEMORY;
40+ return NULL;
41+ }
42+/* END MOZILLA CHANGE */
43 #ifdef XML_CONTEXT_BYTES
44 int keep = (int)(bufferPtr - buffer);
45
46@@ -1719,7 +1730,15 @@
47 bufferSize = INIT_BUFFER_SIZE;
48 do {
49 bufferSize *= 2;
50- } while (bufferSize < neededSize);
51+/* BEGIN MOZILLA CHANGE (prevent infinite loop on overflow) */
52+ } while (bufferSize < neededSize && bufferSize > 0);
53+/* END MOZILLA CHANGE */
54+/* BEGIN MOZILLA CHANGE (sanity check bufferSize) */
55+ if (bufferSize <= 0) {
56+ errorCode = XML_ERROR_NO_MEMORY;
57+ return NULL;
58+ }
59+/* END MOZILLA CHANGE */
60 newBuf = (char *)MALLOC(bufferSize);
61 if (newBuf == 0) {
62 errorCode = XML_ERROR_NO_MEMORY;
diff --git a/meta/recipes-core/expat/expat.inc b/meta/recipes-core/expat/expat.inc
index 4bd60a2a6d..fe9d7e74f0 100644
--- a/meta/recipes-core/expat/expat.inc
+++ b/meta/recipes-core/expat/expat.inc
@@ -4,9 +4,8 @@ HOMEPAGE = "http://expat.sourceforge.net/"
4SECTION = "libs" 4SECTION = "libs"
5LICENSE = "MIT" 5LICENSE = "MIT"
6 6
7SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \ 7SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \
8 file://autotools.patch \ 8 file://autotools.patch \
9 file://expat-CVE-2015-1283.patch \
10 " 9 "
11 10
12inherit autotools lib_package gzipnative 11inherit autotools lib_package gzipnative
diff --git a/meta/recipes-core/expat/expat-2.1.0/autotools.patch b/meta/recipes-core/expat/expat/autotools.patch
index 0e599697a6..3d3c5bad9d 100644
--- a/meta/recipes-core/expat/expat-2.1.0/autotools.patch
+++ b/meta/recipes-core/expat/expat/autotools.patch
@@ -11,8 +11,8 @@ Updated to apply over expat 2.1.0
11Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> 11Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
12 12
13diff -Nurd expat-2.1.0/configure.in expat-2.1.0/configure.in 13diff -Nurd expat-2.1.0/configure.in expat-2.1.0/configure.in
14--- expat-2.1.0/configure.in 2012-03-04 01:45:53.000000000 +0200 14--- expat-2.1.0/configure.ac 2012-03-04 01:45:53.000000000 +0200
15+++ expat-2.1.0/configure.in 2012-05-10 21:04:44.000000000 +0300 15+++ expat-2.1.0/configure.ac 2012-05-10 21:04:44.000000000 +0300
16@@ -51,8 +51,6 @@ 16@@ -51,8 +51,6 @@
17 17
18 AC_CONFIG_HEADER(expat_config.h) 18 AC_CONFIG_HEADER(expat_config.h)
diff --git a/meta/recipes-core/expat/expat_2.1.0.bb b/meta/recipes-core/expat/expat_2.1.0.bb
deleted file mode 100644
index b958742edc..0000000000
--- a/meta/recipes-core/expat/expat_2.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require expat.inc
2LIC_FILES_CHKSUM = "file://COPYING;md5=1b71f681713d1256e1c23b0890920874"
3
4SRC_URI[md5sum] = "dd7dab7a5fea97d2a6a43f511449b7cd"
5SRC_URI[sha256sum] = "823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86"
diff --git a/meta/recipes-core/expat/expat_2.1.1.bb b/meta/recipes-core/expat/expat_2.1.1.bb
new file mode 100644
index 0000000000..75c80de1b5
--- /dev/null
+++ b/meta/recipes-core/expat/expat_2.1.1.bb
@@ -0,0 +1,5 @@
1require expat.inc
2LIC_FILES_CHKSUM = "file://COPYING;md5=1b71f681713d1256e1c23b0890920874"
3
4SRC_URI[md5sum] = "7380a64a8e3a9d66a9887b01d0d7ea81"
5SRC_URI[sha256sum] = "aff584e5a2f759dcfc6d48671e9529f6afe1e30b0cd6a4cec200cbe3f793de67"