diff options
author | Armin Kuster <akuster@mvista.com> | 2015-12-05 10:52:42 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-20 17:08:28 +0000 |
commit | 9d44210c74d3bd34d1dce59b59744ddf7e73b7b2 (patch) | |
tree | 00ba5a0be67359b38d50914ec43f28d599511eb0 /meta/recipes-core/libxml/libxml2/CVE-2015-7941-1-Stop-parsing-on-entities-boundaries-errors.patch | |
parent | d3ad918a712769e6e3ead7ad590f6a9fdac0c3dc (diff) | |
download | poky-9d44210c74d3bd34d1dce59b59744ddf7e73b7b2.tar.gz |
libxml2: security fix CVE-2015-7941
includes:
CVE-2015-7941-1
CVE-2015-7941-2
(From OE-Core rev: e06312c71209b2e1d19c7df1434e409ad96b58be)
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/CVE-2015-7941-1-Stop-parsing-on-entities-boundaries-errors.patch')
-rw-r--r-- | meta/recipes-core/libxml/libxml2/CVE-2015-7941-1-Stop-parsing-on-entities-boundaries-errors.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-7941-1-Stop-parsing-on-entities-boundaries-errors.patch b/meta/recipes-core/libxml/libxml2/CVE-2015-7941-1-Stop-parsing-on-entities-boundaries-errors.patch new file mode 100644 index 0000000000..11da9f9bd9 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2015-7941-1-Stop-parsing-on-entities-boundaries-errors.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From a7dfab7411cbf545f359dd3157e5df1eb0e7ce31 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Veillard <veillard@redhat.com> | ||
3 | Date: Mon, 23 Feb 2015 11:17:35 +0800 | ||
4 | Subject: [PATCH] Stop parsing on entities boundaries errors | ||
5 | |||
6 | For https://bugzilla.gnome.org/show_bug.cgi?id=744980 | ||
7 | |||
8 | There are times, like on unterminated entities that it's preferable to | ||
9 | stop parsing, even if that means less error reporting. Entities are | ||
10 | feeding the parser on further processing, and if they are ill defined | ||
11 | then it's possible to get the parser to bug. Also do the same on | ||
12 | Conditional Sections if the input is broken, as the structure of | ||
13 | the document can't be guessed. | ||
14 | |||
15 | Upstream-Status: Backport | ||
16 | |||
17 | CVE-2015-7941-1 | ||
18 | |||
19 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
20 | |||
21 | --- | ||
22 | parser.c | 1 + | ||
23 | 1 file changed, 1 insertion(+) | ||
24 | |||
25 | diff --git a/parser.c b/parser.c | ||
26 | index a8d1b67..bbe97eb 100644 | ||
27 | --- a/parser.c | ||
28 | +++ b/parser.c | ||
29 | @@ -5658,6 +5658,7 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt) { | ||
30 | if (RAW != '>') { | ||
31 | xmlFatalErrMsgStr(ctxt, XML_ERR_ENTITY_NOT_FINISHED, | ||
32 | "xmlParseEntityDecl: entity %s not terminated\n", name); | ||
33 | + xmlStopParser(ctxt); | ||
34 | } else { | ||
35 | if (input != ctxt->input) { | ||
36 | xmlFatalErrMsg(ctxt, XML_ERR_ENTITY_BOUNDARY, | ||
37 | -- | ||
38 | 2.3.5 | ||
39 | |||