summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2016-02-06 23:15:00 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-07 17:23:05 (GMT)
commitc2f4fe8d0c7e5d0c5720aaee20c5f7a8f6ea068c (patch)
treef56876838b3ce922482a4c62e6019d8324b455bf
parentce70f38442350145fc6e506b35f88bd4329cf9c8 (diff)
downloadpoky-c2f4fe8d0c7e5d0c5720aaee20c5f7a8f6ea068c.tar.gz
libxml2: Security fix CVE-2015-8241
CVE-2015-8241 libxml2: Buffer overread with XML parser in xmlNextChar (From OE-Core rev: f3c19a39cdec435f26a7f46a3432231ba4daa19c) (From OE-Core rev: 428878a67fd723908af74c4881e933969f2928a7) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/libxml/libxml2.inc1
-rw-r--r--meta/recipes-core/libxml/libxml2/CVE-2015-8241.patch40
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc
index 4f2034e..01d6bbe 100644
--- a/meta/recipes-core/libxml/libxml2.inc
+++ b/meta/recipes-core/libxml/libxml2.inc
@@ -37,6 +37,7 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \
37 file://0001-CVE-2015-7500-Fix-memory-access-error-due-to-incorre.patch \ 37 file://0001-CVE-2015-7500-Fix-memory-access-error-due-to-incorre.patch \
38 file://0001-CVE-2015-8242-Buffer-overead-with-HTML-parser-in-pus.patch \ 38 file://0001-CVE-2015-8242-Buffer-overead-with-HTML-parser-in-pus.patch \
39 file://0001-CVE-2015-5312-Another-entity-expansion-issue.patch \ 39 file://0001-CVE-2015-5312-Another-entity-expansion-issue.patch \
40 file://CVE-2015-8241.patch \
40 " 41 "
41 42
42BINCONFIG = "${bindir}/xml2-config" 43BINCONFIG = "${bindir}/xml2-config"
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-8241.patch b/meta/recipes-core/libxml/libxml2/CVE-2015-8241.patch
new file mode 100644
index 0000000..89a46ad
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2/CVE-2015-8241.patch
@@ -0,0 +1,40 @@
1From ab2b9a93ff19cedde7befbf2fcc48c6e352b6cbe Mon Sep 17 00:00:00 2001
2From: Hugh Davenport <hugh@allthethings.co.nz>
3Date: Tue, 3 Nov 2015 20:40:49 +0800
4Subject: [PATCH] Avoid extra processing of MarkupDecl when EOF
5
6For https://bugzilla.gnome.org/show_bug.cgi?id=756263
7
8One place where ctxt->instate == XML_PARSER_EOF whic was set up
9by entity detection issues doesn't get noticed, and even overrided
10
11Upstream-status: Backport
12
13https://git.gnome.org/browse/libxml2/commit/?id=ab2b9a93ff19cedde7befbf2fcc48c6e352b6cbe
14
15CVE: CVE-2015-8241
16Signed-off-by: Armin Kuster <akuster@mvista.com>
17
18---
19 parser.c | 8 ++++++++
20 1 file changed, 8 insertions(+)
21
22Index: libxml2-2.9.2/parser.c
23===================================================================
24--- libxml2-2.9.2.orig/parser.c
25+++ libxml2-2.9.2/parser.c
26@@ -6999,6 +6999,14 @@ xmlParseMarkupDecl(xmlParserCtxtPtr ctxt
27 xmlParsePI(ctxt);
28 }
29 }
30+
31+ /*
32+ * detect requirement to exit there and act accordingly
33+ * and avoid having instate overriden later on
34+ */
35+ if (ctxt->instate == XML_PARSER_EOF)
36+ return;
37+
38 /*
39 * This is only for internal subset. On external entities,
40 * the replacement is done before parsing stage