diff options
author | Armin Kuster <akuster@mvista.com> | 2015-12-05 10:54:57 -0800 |
---|---|---|
committer | Robert Yang <liezhi.yang@windriver.com> | 2016-01-13 22:21:20 -0800 |
commit | 66c7e97f8687c1b656c322282ee7cdc200945616 (patch) | |
tree | a3f1b0d9f2f25f324f78e0f2bc2a6d8b90f2a244 /meta/recipes-core/libxml/libxml2/CVE-2015-7942-Another-variation-of-overflow-in-Conditional-section.patch | |
parent | 42086e309dfce3caa05e88681875f5f78cf5f095 (diff) | |
download | openembedded-core-contrib-66c7e97f8687c1b656c322282ee7cdc200945616.tar.gz |
libxml2: security fix CVE-2015-7942
includes:
CVE-2015-7942
CVE-2015-7942-2
Signed-off-by: Armin Kuster <akuster@mvista.com>
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 @@ +From bd0526e66a56e75a18da8c15c4750db8f801c52d Mon Sep 17 00:00:00 2001 +From: Daniel Veillard <veillard@redhat.com> +Date: Fri, 23 Oct 2015 19:02:28 +0800 +Subject: [PATCH] Another variation of overflow in Conditional sections + +Which happen after the previous fix to +https://bugzilla.gnome.org/show_bug.cgi?id=756456 + +But stopping the parser and exiting we didn't pop the intermediary entities +and doing the SKIP there applies on an input which may be too small + +Upstream-Status: Backport + +CVE-2015-7942 + +Signed-off-by: Armin Kuster <akuster@mvista.com> + +--- + parser.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/parser.c b/parser.c +index a65e4cc..b9217ff 100644 +--- a/parser.c ++++ b/parser.c +@@ -6915,7 +6915,9 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) { + "All markup of the conditional section is not in the same entity\n", + NULL, NULL); + } +- SKIP(3); ++ if ((ctxt-> instate != XML_PARSER_EOF) && ++ ((ctxt->input->cur + 3) < ctxt->input->end)) ++ SKIP(3); + } + } + +-- +2.3.5 + |