diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-05-22 13:03:54 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-05-22 13:03:54 +0000 |
| commit | 13e59ed69b9459e1ef4534ee2f34e5f94fb99232 (patch) | |
| tree | f52d3ef4b622ce325201c1045102a2a8f96c5b99 /main/libxml2/CVE-2014-0191.patch | |
| parent | 39a0663834fda2690f8b749de369700e7d995fdd (diff) | |
| download | aports-13e59ed69b9459e1ef4534ee2f34e5f94fb99232.tar.bz2 aports-13e59ed69b9459e1ef4534ee2f34e5f94fb99232.tar.xz | |
main/libxml2: security fix for CVE-2014-0191
Diffstat (limited to 'main/libxml2/CVE-2014-0191.patch')
| -rw-r--r-- | main/libxml2/CVE-2014-0191.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/main/libxml2/CVE-2014-0191.patch b/main/libxml2/CVE-2014-0191.patch new file mode 100644 index 000000000..4d5fe1a7a --- /dev/null +++ b/main/libxml2/CVE-2014-0191.patch @@ -0,0 +1,36 @@ +From 9cd1c3cfbd32655d60572c0a413e017260c854df Mon Sep 17 00:00:00 2001 +From: Daniel Veillard <veillard@redhat.com> +Date: Tue, 22 Apr 2014 15:30:56 +0800 +Subject: Do not fetch external parameter entities + +Unless explicitely asked for when validating or replacing entities +with their value. Problem pointed out by Daniel Berrange <berrange@redhat.com> + +diff --git a/parser.c b/parser.c +index 9347ac9..c0dea05 100644 +--- a/parser.c ++++ b/parser.c +@@ -2598,6 +2598,20 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) { + xmlCharEncoding enc; + + /* ++ * Note: external parsed entities will not be loaded, it is ++ * not required for a non-validating parser, unless the ++ * option of validating, or substituting entities were ++ * given. Doing so is far more secure as the parser will ++ * only process data coming from the document entity by ++ * default. ++ */ ++ if ((entity->etype == XML_EXTERNAL_PARAMETER_ENTITY) && ++ ((ctxt->options & XML_PARSE_NOENT) == 0) && ++ ((ctxt->options & XML_PARSE_DTDVALID) == 0) && ++ (ctxt->validate == 0)) ++ return; ++ ++ /* + * handle the extra spaces added before and after + * c.f. http://www.w3.org/TR/REC-xml#as-PE + * this is done independently. +-- +cgit v0.10.1 + |