mirror of
https://git.yoctoproject.org/poky
synced 2026-02-22 01:19:41 +01:00
94d9c374e9
Affects limbxml2 < 2.9.4 (From OE-Core rev: 6f6132dc3aeb0d660c9730f6f33e9194a6098226) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From b1d34de46a11323fccffa9fadeb33be670d602f5 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Veillard <veillard@redhat.com>
|
|
Date: Mon, 14 Mar 2016 17:19:44 +0800
|
|
Subject: [PATCH] Fix inappropriate fetch of entities content
|
|
|
|
For https://bugzilla.gnome.org/show_bug.cgi?id=761430
|
|
|
|
libfuzzer regression testing exposed another case where the parser would
|
|
fetch content of an external entity while not in validating mode.
|
|
Plug that hole
|
|
|
|
Upstream-status: Backport
|
|
CVE: CVE-2016-4449
|
|
|
|
Signed-off-by: Armin Kuster <akuster@mvista.com>
|
|
|
|
---
|
|
parser.c | 16 +++++++++++++++-
|
|
1 file changed, 15 insertions(+), 1 deletion(-)
|
|
|
|
Index: libxml2-2.9.2/parser.c
|
|
===================================================================
|
|
--- libxml2-2.9.2.orig/parser.c
|
|
+++ libxml2-2.9.2/parser.c
|
|
@@ -2873,7 +2873,21 @@ xmlStringLenDecodeEntities(xmlParserCtxt
|
|
ctxt->nbentities += ent->checked / 2;
|
|
if (ent != NULL) {
|
|
if (ent->content == NULL) {
|
|
- xmlLoadEntityContent(ctxt, ent);
|
|
+ /*
|
|
+ * Note: external parsed entities will not be loaded,
|
|
+ * it is not required for a non-validating parser to
|
|
+ * complete external PEreferences coming from the
|
|
+ * internal subset
|
|
+ */
|
|
+ if (((ctxt->options & XML_PARSE_NOENT) != 0) ||
|
|
+ ((ctxt->options & XML_PARSE_DTDVALID) != 0) ||
|
|
+ (ctxt->validate != 0)) {
|
|
+ xmlLoadEntityContent(ctxt, ent);
|
|
+ } else {
|
|
+ xmlWarningMsg(ctxt, XML_ERR_ENTITY_PROCESSING,
|
|
+ "not validating will not read content for PE entity %s\n",
|
|
+ ent->name, NULL);
|
|
+ }
|
|
}
|
|
ctxt->depth++;
|
|
rep = xmlStringDecodeEntities(ctxt, ent->content, what,
|