diff options
author | Armin Kuster <akuster@mvista.com> | 2015-12-05 10:54:57 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-20 17:08:29 +0000 |
commit | 663943a80238572030978df484c73f4e80e06bf1 (patch) | |
tree | 1f461ae0303e0e088ee1274d167ce483f2f48ce3 /meta/recipes-core/libxml/libxml2/CVE-2015-7942-Another-variation-of-overflow-in-Conditional-section.patch | |
parent | 7aaf773d3243203b11592f92442f68009c476541 (diff) | |
download | poky-663943a80238572030978df484c73f4e80e06bf1.tar.gz |
libxml2: security fix CVE-2015-7942
includes:
CVE-2015-7942
CVE-2015-7942-2
(From OE-Core rev: 4ca806d70cf65a66daab85898bcf5d682bef43d3)
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/libxml/libxml2/CVE-2015-7942-Another-variation-of-overflow-in-Conditional-section.patch')
-rw-r--r-- | meta/recipes-core/libxml/libxml2/CVE-2015-7942-Another-variation-of-overflow-in-Conditional-section.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-7942-Another-variation-of-overflow-in-Conditional-section.patch b/meta/recipes-core/libxml/libxml2/CVE-2015-7942-Another-variation-of-overflow-in-Conditional-section.patch new file mode 100644 index 0000000000..40082ec07f --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2015-7942-Another-variation-of-overflow-in-Conditional-section.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From bd0526e66a56e75a18da8c15c4750db8f801c52d Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Veillard <veillard@redhat.com> | ||
3 | Date: Fri, 23 Oct 2015 19:02:28 +0800 | ||
4 | Subject: [PATCH] Another variation of overflow in Conditional sections | ||
5 | |||
6 | Which happen after the previous fix to | ||
7 | https://bugzilla.gnome.org/show_bug.cgi?id=756456 | ||
8 | |||
9 | But stopping the parser and exiting we didn't pop the intermediary entities | ||
10 | and doing the SKIP there applies on an input which may be too small | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | |||
14 | CVE-2015-7942 | ||
15 | |||
16 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
17 | |||
18 | --- | ||
19 | parser.c | 4 +++- | ||
20 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/parser.c b/parser.c | ||
23 | index a65e4cc..b9217ff 100644 | ||
24 | --- a/parser.c | ||
25 | +++ b/parser.c | ||
26 | @@ -6915,7 +6915,9 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) { | ||
27 | "All markup of the conditional section is not in the same entity\n", | ||
28 | NULL, NULL); | ||
29 | } | ||
30 | - SKIP(3); | ||
31 | + if ((ctxt-> instate != XML_PARSER_EOF) && | ||
32 | + ((ctxt->input->cur + 3) < ctxt->input->end)) | ||
33 | + SKIP(3); | ||
34 | } | ||
35 | } | ||
36 | |||
37 | -- | ||
38 | 2.3.5 | ||
39 | |||