diff options
author | Armin Kuster <akuster@mvista.com> | 2015-12-05 11:00:24 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-20 17:08:30 +0000 |
commit | 48d9e0091363d0d691862554209e2dde5d112c06 (patch) | |
tree | 7eb43f35c052672c3f80544acbeb2d3b29356845 /meta/recipes-core/libxml/libxml2/0001-CVE-2015-5312-Another-entity-expansion-issue.patch | |
parent | 436e2044451bf25bcac3d17e3dd85dc8ea99e7d0 (diff) | |
download | ast2050-yocto-poky-48d9e0091363d0d691862554209e2dde5d112c06.zip ast2050-yocto-poky-48d9e0091363d0d691862554209e2dde5d112c06.tar.gz |
libxml2: security fix CVE-2015-5312
(From OE-Core rev: 15d05f186fbe78774c933cf93f116af1a2a8e51a)
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/0001-CVE-2015-5312-Another-entity-expansion-issue.patch')
-rw-r--r-- | meta/recipes-core/libxml/libxml2/0001-CVE-2015-5312-Another-entity-expansion-issue.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-core/libxml/libxml2/0001-CVE-2015-5312-Another-entity-expansion-issue.patch b/meta/recipes-core/libxml/libxml2/0001-CVE-2015-5312-Another-entity-expansion-issue.patch new file mode 100644 index 0000000..979618d --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/0001-CVE-2015-5312-Another-entity-expansion-issue.patch @@ -0,0 +1,39 @@ +From 69030714cde66d525a8884bda01b9e8f0abf8e1e Mon Sep 17 00:00:00 2001 +From: David Drysdale <drysdale@google.com> +Date: Fri, 20 Nov 2015 11:13:45 +0800 +Subject: [PATCH] CVE-2015-5312 Another entity expansion issue + +For https://bugzilla.gnome.org/show_bug.cgi?id=756733 +It is one case where the code in place to detect entities expansions +failed to exit when the situation was detected, leading to DoS +Problem reported by Kostya Serebryany @ Google +Patch provided by David Drysdale @ Google + +Upstream-Status: Backport + +CVE-2015-5312 + +Signed-off-by: Armin Kuster <akuster@mvista.com> + +--- + parser.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/parser.c b/parser.c +index b7b6668..da6e729 100644 +--- a/parser.c ++++ b/parser.c +@@ -2806,6 +2806,10 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, + 0, 0, 0); + ctxt->depth--; + ++ if ((ctxt->lastError.code == XML_ERR_ENTITY_LOOP) || ++ (ctxt->lastError.code == XML_ERR_INTERNAL_ERROR)) ++ goto int_error; ++ + if (rep != NULL) { + current = rep; + while (*current != 0) { /* non input consuming loop */ +-- +2.3.5 + |