You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
72 lines
2.4 KiB
72 lines
2.4 KiB
From d88b1b5e55b9ba0962408ff5e0327bf71a79e37a Mon Sep 17 00:00:00 2001 |
|
From: Peter Simons <psimons@suse.com> |
|
Date: Fri, 15 Apr 2016 11:56:55 +0200 |
|
Subject: [PATCH] Add missing increments of recursion depth counter to XML |
|
parser. |
|
To: libvir-list@redhat.com |
|
|
|
For https://bugzilla.gnome.org/show_bug.cgi?id=765207 |
|
CVE-2016-3705 |
|
The functions xmlParserEntityCheck() and xmlParseAttValueComplex() used to call |
|
xmlStringDecodeEntities() in a recursive context without incrementing the |
|
'depth' counter in the parser context. Because of that omission, the parser |
|
failed to detect attribute recursions in certain documents before running out |
|
of stack space. |
|
|
|
Signed-off-by: Daniel Veillard <veillard@redhat.com> |
|
--- |
|
parser.c | 8 ++++++++ |
|
1 file changed, 8 insertions(+) |
|
|
|
diff --git a/parser.c b/parser.c |
|
index 0accf54..32293d0 100644 |
|
--- a/parser.c |
|
+++ b/parser.c |
|
@@ -144,8 +144,10 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size, |
|
|
|
ent->checked = 1; |
|
|
|
+ ++ctxt->depth; |
|
rep = xmlStringDecodeEntities(ctxt, ent->content, |
|
XML_SUBSTITUTE_REF, 0, 0, 0); |
|
+ --ctxt->depth; |
|
|
|
ent->checked = (ctxt->nbentities - oldnbent + 1) * 2; |
|
if (rep != NULL) { |
|
@@ -3963,8 +3965,10 @@ xmlParseEntityValue(xmlParserCtxtPtr ctxt, xmlChar **orig) { |
|
* an entity declaration, it is bypassed and left as is. |
|
* so XML_SUBSTITUTE_REF is not set here. |
|
*/ |
|
+ ++ctxt->depth; |
|
ret = xmlStringDecodeEntities(ctxt, buf, XML_SUBSTITUTE_PEREF, |
|
0, 0, 0); |
|
+ --ctxt->depth; |
|
if (orig != NULL) |
|
*orig = buf; |
|
else |
|
@@ -4089,9 +4093,11 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) { |
|
} else if ((ent != NULL) && |
|
(ctxt->replaceEntities != 0)) { |
|
if (ent->etype != XML_INTERNAL_PREDEFINED_ENTITY) { |
|
+ ++ctxt->depth; |
|
rep = xmlStringDecodeEntities(ctxt, ent->content, |
|
XML_SUBSTITUTE_REF, |
|
0, 0, 0); |
|
+ --ctxt->depth; |
|
if (rep != NULL) { |
|
current = rep; |
|
while (*current != 0) { /* non input consuming */ |
|
@@ -4127,8 +4133,10 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) { |
|
(ent->content != NULL) && (ent->checked == 0)) { |
|
unsigned long oldnbent = ctxt->nbentities; |
|
|
|
+ ++ctxt->depth; |
|
rep = xmlStringDecodeEntities(ctxt, ent->content, |
|
XML_SUBSTITUTE_REF, 0, 0, 0); |
|
+ --ctxt->depth; |
|
|
|
ent->checked = (ctxt->nbentities - oldnbent + 1) * 2; |
|
if (rep != NULL) { |
|
-- |
|
2.5.5 |
|
|
|
|