diff options
author | Armin Kuster <akuster@mvista.com> | 2016-07-09 14:54:21 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-27 08:29:58 +0100 |
commit | 4cdca0571a9a1feb45a7aade7d86354935cc300c (patch) | |
tree | d327d51d2d300c8cadb59e85068afc758ef2e145 /meta/recipes-core/libxml/libxml2 | |
parent | 17480a956d7fcdf8aa01d3825b50595926dd1d4b (diff) | |
download | poky-4cdca0571a9a1feb45a7aade7d86354935cc300c.tar.gz |
libxml2: Security fix for CVE-2016-1840
affects libxml2 < 2.9.4
(From OE-Core rev: 9d894179128771c4a2628c103f5c39e2e6ef13c5)
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/libxml/libxml2')
-rw-r--r-- | meta/recipes-core/libxml/libxml2/CVE-2016-1840.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2016-1840.patch b/meta/recipes-core/libxml/libxml2/CVE-2016-1840.patch new file mode 100644 index 0000000000..41de9f80d8 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2016-1840.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From cbb271655cadeb8dbb258a64701d9a3a0c4835b4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Pranjal Jumde <pjumde@apple.com> | ||
3 | Date: Mon, 7 Mar 2016 06:34:26 -0800 | ||
4 | Subject: [PATCH] Bug 757711: heap-buffer-overflow in xmlFAParsePosCharGroup | ||
5 | <https://bugzilla.gnome.org/show_bug.cgi?id=757711> | ||
6 | |||
7 | * xmlregexp.c: | ||
8 | (xmlFAParseCharRange): Only advance to the next character if | ||
9 | there is no error. Advancing to the next character in case of | ||
10 | an error while parsing regexp leads to an out of bounds access. | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | CVE: CVE-2016-1840 | ||
14 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
15 | |||
16 | --- | ||
17 | xmlregexp.c | 3 ++- | ||
18 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
19 | |||
20 | Index: libxml2-2.9.2/xmlregexp.c | ||
21 | =================================================================== | ||
22 | --- libxml2-2.9.2.orig/xmlregexp.c | ||
23 | +++ libxml2-2.9.2/xmlregexp.c | ||
24 | @@ -5052,11 +5052,12 @@ xmlFAParseCharRange(xmlRegParserCtxtPtr | ||
25 | ERROR("Expecting the end of a char range"); | ||
26 | return; | ||
27 | } | ||
28 | - NEXTL(len); | ||
29 | + | ||
30 | /* TODO check that the values are acceptable character ranges for XML */ | ||
31 | if (end < start) { | ||
32 | ERROR("End of range is before start of range"); | ||
33 | } else { | ||
34 | + NEXTL(len); | ||
35 | xmlRegAtomAddRange(ctxt, ctxt->atom, ctxt->neg, | ||
36 | XML_REGEXP_CHARVAL, start, end, NULL); | ||
37 | } | ||