summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSona Sarmadi <sona.sarmadi@enea.com>2015-12-14 12:24:13 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-30 12:03:14 (GMT)
commita779191033f3fd1afcdcb7d4aeb4911ce48b13ed (patch)
treecb7c076656f8c1741f0f91f282600eaa740f5af5
parent1930286e3fa4a144dae963fb531e7caa1311c225 (diff)
downloadpoky-a779191033f3fd1afcdcb7d4aeb4911ce48b13ed.tar.gz
libxml2: CVE-2015-8241
Upstream bug (contains reproducer): https://bugzilla.gnome.org/show_bug.cgi?id=756263 Upstream patch: https://git.gnome.org/browse/libxml2/commit/?id= ab2b9a93ff19cedde7befbf2fcc48c6e352b6cbe (From OE-Core rev: 84c6a67baaafee565ac4fad229bd8d07a21da09c) Signed-off-by: Tudor Florea <tudor.florea@enea.com> Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> 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.patch41
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc
index d5e263b..2dafeb4 100644
--- a/meta/recipes-core/libxml/libxml2.inc
+++ b/meta/recipes-core/libxml/libxml2.inc
@@ -25,6 +25,7 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \
25 file://0001-CVE-2015-1819-Enforce-the-reader-to-run-in-constant-.patch \ 25 file://0001-CVE-2015-1819-Enforce-the-reader-to-run-in-constant-.patch \
26 file://CVE-2015-7942.patch \ 26 file://CVE-2015-7942.patch \
27 file://CVE-2015-8035.patch \ 27 file://CVE-2015-8035.patch \
28 file://CVE-2015-8241.patch \
28 " 29 "
29 30
30BINCONFIG = "${bindir}/xml2-config" 31BINCONFIG = "${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..98b30f0
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2/CVE-2015-8241.patch
@@ -0,0 +1,41 @@
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: 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
11Fixes CVE-2015-8241.
12
13Upstream-Status: Backport
14
15Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
16---
17 parser.c | 8 ++++++++
18 1 file changed, 8 insertions(+)
19
20diff --git a/parser.c b/parser.c
21index d67b300..134afe7 100644
22--- a/parser.c
23+++ b/parser.c
24@@ -6972,6 +6972,14 @@ xmlParseMarkupDecl(xmlParserCtxtPtr ctxt) {
25 xmlParsePI(ctxt);
26 }
27 }
28+
29+ /*
30+ * detect requirement to exit there and act accordingly
31+ * and avoid having instate overriden later on
32+ */
33+ if (ctxt->instate == XML_PARSER_EOF)
34+ return;
35+
36 /*
37 * This is only for internal subset. On external entities,
38 * the replacement is done before parsing stage
39--
40cgit v0.11.2
41