diff options
author | Armin Kuster <akuster@mvista.com> | 2016-01-30 14:37:35 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-04 23:20:16 +0000 |
commit | 2ec6d1dcbca7e52f145623483f20ab9c7cf08d99 (patch) | |
tree | 2976b1b1e238ac923ba248b1eef7d9c8afbde642 | |
parent | 55aafb547de2ba110bfc897cf7f3a6b18cb29880 (diff) | |
download | poky-2ec6d1dcbca7e52f145623483f20ab9c7cf08d99.tar.gz |
libxml2: Security fix CVE-2015-8241
CVE-2015-8241 libxml2: Buffer overread with XML parser in xmlNextChar
(From OE-Core rev: f3c19a39cdec435f26a7f46a3432231ba4daa19c)
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/libxml/libxml2.inc | 1 | ||||
-rw-r--r-- | meta/recipes-core/libxml/libxml2/CVE-2015-8241.patch | 40 |
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc index b9ce0f0359..bced950fa9 100644 --- a/meta/recipes-core/libxml/libxml2.inc +++ b/meta/recipes-core/libxml/libxml2.inc | |||
@@ -35,6 +35,7 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \ | |||
35 | file://0001-CVE-2015-7500-Fix-memory-access-error-due-to-incorre.patch \ | 35 | file://0001-CVE-2015-7500-Fix-memory-access-error-due-to-incorre.patch \ |
36 | file://0001-CVE-2015-8242-Buffer-overead-with-HTML-parser-in-pus.patch \ | 36 | file://0001-CVE-2015-8242-Buffer-overead-with-HTML-parser-in-pus.patch \ |
37 | file://0001-CVE-2015-5312-Another-entity-expansion-issue.patch \ | 37 | file://0001-CVE-2015-5312-Another-entity-expansion-issue.patch \ |
38 | file://CVE-2015-8241.patch \ | ||
38 | " | 39 | " |
39 | 40 | ||
40 | BINCONFIG = "${bindir}/xml2-config" | 41 | BINCONFIG = "${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 0000000000..89a46ad173 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2015-8241.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From ab2b9a93ff19cedde7befbf2fcc48c6e352b6cbe Mon Sep 17 00:00:00 2001 | ||
2 | From: Hugh Davenport <hugh@allthethings.co.nz> | ||
3 | Date: Tue, 3 Nov 2015 20:40:49 +0800 | ||
4 | Subject: [PATCH] Avoid extra processing of MarkupDecl when EOF | ||
5 | |||
6 | For https://bugzilla.gnome.org/show_bug.cgi?id=756263 | ||
7 | |||
8 | One place where ctxt->instate == XML_PARSER_EOF whic was set up | ||
9 | by entity detection issues doesn't get noticed, and even overrided | ||
10 | |||
11 | Upstream-status: Backport | ||
12 | |||
13 | https://git.gnome.org/browse/libxml2/commit/?id=ab2b9a93ff19cedde7befbf2fcc48c6e352b6cbe | ||
14 | |||
15 | CVE: CVE-2015-8241 | ||
16 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
17 | |||
18 | --- | ||
19 | parser.c | 8 ++++++++ | ||
20 | 1 file changed, 8 insertions(+) | ||
21 | |||
22 | Index: 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 | ||