mirror of
https://git.yoctoproject.org/poky
synced 2026-04-20 18:32:12 +02:00
8514d21e6a
CVE-2015-7942 libxml2: heap-based buffer overflow in xmlParseConditionalSections() CVE-2015-8035 libxml2: DoS when parsing specially crafted XML document if XZ support is enabled [YOCTO #8641] (From OE-Core rev: 27de51f4ad21d9b896e7d48041e7cdf20c564a38) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
56 lines
1.6 KiB
Diff
56 lines
1.6 KiB
Diff
libxml2: CVE-2015-7942
|
|
|
|
From 9b8512337d14c8ddf662fcb98b0135f225a1c489 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Veillard <veillard@redhat.com>
|
|
Date: Mon, 23 Feb 2015 11:29:20 +0800
|
|
Subject: Cleanup conditional section error handling
|
|
|
|
For https://bugzilla.gnome.org/show_bug.cgi?id=744980
|
|
|
|
The error handling of Conditional Section also need to be
|
|
straightened as the structure of the document can't be
|
|
guessed on a failure there and it's better to stop parsing
|
|
as further errors are likely to be irrelevant.
|
|
|
|
Upstream-Status: Backport
|
|
https://git.gnome.org/browse/libxml2/patch/?id=9b8512337d14c8ddf662fcb98b0135f225a1c489
|
|
|
|
[YOCTO #8641]
|
|
Signed-off-by: Armin Kuster <akuster@mvista.com>
|
|
|
|
---
|
|
parser.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
Index: libxml2-2.9.2/parser.c
|
|
===================================================================
|
|
--- libxml2-2.9.2.orig/parser.c
|
|
+++ libxml2-2.9.2/parser.c
|
|
@@ -6783,6 +6783,8 @@ xmlParseConditionalSections(xmlParserCtx
|
|
SKIP_BLANKS;
|
|
if (RAW != '[') {
|
|
xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL);
|
|
+ xmlStopParser(ctxt);
|
|
+ return;
|
|
} else {
|
|
if (ctxt->input->id != id) {
|
|
xmlValidityError(ctxt, XML_ERR_ENTITY_BOUNDARY,
|
|
@@ -6843,6 +6845,8 @@ xmlParseConditionalSections(xmlParserCtx
|
|
SKIP_BLANKS;
|
|
if (RAW != '[') {
|
|
xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL);
|
|
+ xmlStopParser(ctxt);
|
|
+ return;
|
|
} else {
|
|
if (ctxt->input->id != id) {
|
|
xmlValidityError(ctxt, XML_ERR_ENTITY_BOUNDARY,
|
|
@@ -6898,6 +6902,8 @@ xmlParseConditionalSections(xmlParserCtx
|
|
|
|
} else {
|
|
xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID_KEYWORD, NULL);
|
|
+ xmlStopParser(ctxt);
|
|
+ return;
|
|
}
|
|
|
|
if (RAW == 0)
|