diff options
author | Armin Kuster <akuster@mvista.com> | 2015-12-05 10:59:55 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-14 15:18:28 +0000 |
commit | f4b0c49145450a97166ba341afaf708f1ac4d6d3 (patch) | |
tree | 311dd318df02a0a42b4939cfb18d8b92189ba984 /meta/recipes-core | |
parent | fb409c9d1769a9a0a9d4f51ae7ecddf116f92524 (diff) | |
download | poky-f4b0c49145450a97166ba341afaf708f1ac4d6d3.tar.gz |
libxml2: security fix CVE-2015-8242
(From OE-Core rev: d392edafa1d73cace437f45bfbc147de9fc4cf8b)
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/libxml/libxml2.inc | 1 | ||||
-rw-r--r-- | meta/recipes-core/libxml/libxml2/0001-CVE-2015-8242-Buffer-overead-with-HTML-parser-in-pus.patch | 49 |
2 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc index 7fd76937be..a30f0b687e 100644 --- a/meta/recipes-core/libxml/libxml2.inc +++ b/meta/recipes-core/libxml/libxml2.inc | |||
@@ -33,6 +33,7 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \ | |||
33 | file://CVE-2015-7499-2-Detect-incoherency-on-GROW.patch \ | 33 | file://CVE-2015-7499-2-Detect-incoherency-on-GROW.patch \ |
34 | file://0001-Fix-a-bug-on-name-parsing-at-the-end-of-current-inpu.patch \ | 34 | file://0001-Fix-a-bug-on-name-parsing-at-the-end-of-current-inpu.patch \ |
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 | " | 37 | " |
37 | 38 | ||
38 | BINCONFIG = "${bindir}/xml2-config" | 39 | BINCONFIG = "${bindir}/xml2-config" |
diff --git a/meta/recipes-core/libxml/libxml2/0001-CVE-2015-8242-Buffer-overead-with-HTML-parser-in-pus.patch b/meta/recipes-core/libxml/libxml2/0001-CVE-2015-8242-Buffer-overead-with-HTML-parser-in-pus.patch new file mode 100644 index 0000000000..73531b3c1d --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/0001-CVE-2015-8242-Buffer-overead-with-HTML-parser-in-pus.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From 8fb4a770075628d6441fb17a1e435100e2f3b1a2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hugh Davenport <hugh@allthethings.co.nz> | ||
3 | Date: Fri, 20 Nov 2015 17:16:06 +0800 | ||
4 | Subject: [PATCH] CVE-2015-8242 Buffer overead with HTML parser in push mode | ||
5 | |||
6 | For https://bugzilla.gnome.org/show_bug.cgi?id=756372 | ||
7 | Error in the code pointing to the codepoint in the stack for the | ||
8 | current char value instead of the pointer in the input that the SAX | ||
9 | callback expects | ||
10 | Reported and fixed by Hugh Davenport | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | |||
14 | CVE-2015-8242 | ||
15 | |||
16 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
17 | |||
18 | --- | ||
19 | HTMLparser.c | 6 +++--- | ||
20 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
21 | |||
22 | diff --git a/HTMLparser.c b/HTMLparser.c | ||
23 | index bdf7807..b729197 100644 | ||
24 | --- a/HTMLparser.c | ||
25 | +++ b/HTMLparser.c | ||
26 | @@ -5735,17 +5735,17 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) { | ||
27 | if (ctxt->keepBlanks) { | ||
28 | if (ctxt->sax->characters != NULL) | ||
29 | ctxt->sax->characters( | ||
30 | - ctxt->userData, &cur, 1); | ||
31 | + ctxt->userData, &in->cur[0], 1); | ||
32 | } else { | ||
33 | if (ctxt->sax->ignorableWhitespace != NULL) | ||
34 | ctxt->sax->ignorableWhitespace( | ||
35 | - ctxt->userData, &cur, 1); | ||
36 | + ctxt->userData, &in->cur[0], 1); | ||
37 | } | ||
38 | } else { | ||
39 | htmlCheckParagraph(ctxt); | ||
40 | if (ctxt->sax->characters != NULL) | ||
41 | ctxt->sax->characters( | ||
42 | - ctxt->userData, &cur, 1); | ||
43 | + ctxt->userData, &in->cur[0], 1); | ||
44 | } | ||
45 | } | ||
46 | ctxt->token = 0; | ||
47 | -- | ||
48 | 2.3.5 | ||
49 | |||