diff options
| author |   Armin Kuster <akuster@mvista.com> | 2015-12-05 11:00:24 -0800 |
|---|---|---|
| committer |   Robert Yang <liezhi.yang@windriver.com> | 2016-01-13 22:21:21 -0800 |
| commit | 8546fada29f2c8ec0111a15fe50d90d3f2518d52 (patch) | |
| tree | 431311d23f1e03e4eb71fd4eedec00a41ebbccab | |
| parent | d392edafa1d73cace437f45bfbc147de9fc4cf8b (diff) | |
| download | openembedded-core-contrib-8546fada29f2c8ec0111a15fe50d90d3f2518d52.tar.gz | |
libxml2: security fix CVE-2015-5312
Signed-off-by: Armin Kuster <akuster@mvista.com>
| -rw-r--r-- | meta/recipes-core/libxml/libxml2.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-core/libxml/libxml2/0001-CVE-2015-5312-Another-entity-expansion-issue.patch | 39 |
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc index a30f0b687e..b9ce0f0359 100644 --- a/meta/recipes-core/libxml/libxml2.inc +++ b/meta/recipes-core/libxml/libxml2.inc @@ -34,6 +34,7 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \ file://0001-Fix-a-bug-on-name-parsing-at-the-end-of-current-inpu.patch \ file://0001-CVE-2015-7500-Fix-memory-access-error-due-to-incorre.patch \ file://0001-CVE-2015-8242-Buffer-overead-with-HTML-parser-in-pus.patch \ + file://0001-CVE-2015-5312-Another-entity-expansion-issue.patch \ " BINCONFIG = "${bindir}/xml2-config" 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 0000000000..979618d2c4 --- /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 + |