diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2019-07-26 12:47:23 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-29 23:50:49 +0100 |
commit | 069cfba445baeb93fb7e038f807a91f92c597d01 (patch) | |
tree | e5036d2bb83fa9a16f007ee12d1964981f25312a /meta/recipes-core | |
parent | 51223035e66c5b27799b15a0f8ebe75d24d3971b (diff) | |
download | poky-069cfba445baeb93fb7e038f807a91f92c597d01.tar.gz |
expat: fix CVE-2018-20843
(From OE-Core rev: 355b6168b722b10eddeb36d5b389128733fbcb64)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/expat/expat/CVE-2018-20843.patch | 26 | ||||
-rw-r--r-- | meta/recipes-core/expat/expat_2.2.6.bb | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-core/expat/expat/CVE-2018-20843.patch b/meta/recipes-core/expat/expat/CVE-2018-20843.patch new file mode 100644 index 0000000000..af6641eff1 --- /dev/null +++ b/meta/recipes-core/expat/expat/CVE-2018-20843.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 11f8838bf99ea0a6f0b76f9760c43704d00c4ff6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sebastian Pipping <sebastian@pipping.org> | ||
3 | Date: Wed, 12 Jun 2019 15:42:22 +0200 | ||
4 | Subject: [PATCH] xmlparse.c: Fix extraction of namespace prefix from XML name | ||
5 | (#186) | ||
6 | |||
7 | Upstream-Status: Backport | ||
8 | CVE: CVE-2018-20843 | ||
9 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
10 | --- | ||
11 | expat/lib/xmlparse.c | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c | ||
15 | index 30d55c5c..737d7cd2 100644 | ||
16 | --- a/expat/lib/xmlparse.c | ||
17 | +++ b/expat/lib/xmlparse.c | ||
18 | @@ -6071,7 +6071,7 @@ setElementTypePrefix(XML_Parser parser, ELEMENT_TYPE *elementType) | ||
19 | else | ||
20 | poolDiscard(&dtd->pool); | ||
21 | elementType->prefix = prefix; | ||
22 | - | ||
23 | + break; | ||
24 | } | ||
25 | } | ||
26 | return 1; | ||
diff --git a/meta/recipes-core/expat/expat_2.2.6.bb b/meta/recipes-core/expat/expat_2.2.6.bb index c9e6081a35..0cef70555a 100644 --- a/meta/recipes-core/expat/expat_2.2.6.bb +++ b/meta/recipes-core/expat/expat_2.2.6.bb | |||
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" | |||
9 | SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ | 9 | SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ |
10 | file://autotools.patch \ | 10 | file://autotools.patch \ |
11 | file://libtool-tag.patch \ | 11 | file://libtool-tag.patch \ |
12 | file://CVE-2018-20843.patch;striplevel=2 \ | ||
12 | " | 13 | " |
13 | 14 | ||
14 | SRC_URI[md5sum] = "ca047ae951b40020ac831c28859161b2" | 15 | SRC_URI[md5sum] = "ca047ae951b40020ac831c28859161b2" |