diff options
author | Lee Chee Yang <chee.yang.lee@intel.com> | 2020-09-08 21:07:44 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-17 12:51:24 +0100 |
commit | 94b6af19ef73f77e1be56c492e3b279fbc667277 (patch) | |
tree | fc1da0cd687acd665a746758dda4a2a998f1d49e /meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb | |
parent | a063c1c630f56792716ecdebf4f8bd9e6cb2a4ef (diff) | |
download | poky-94b6af19ef73f77e1be56c492e3b279fbc667277.tar.gz |
libx11 : fix CVE-2020-14344
fix CVE-2020-14344 with squashed patch.
squashed patch include below patch,
https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/1703b9f3435079d3c6021e1ee2ec34fd4978103d
https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/1a566c9e00e5f35c1f9e7f3d741a02e5170852b2
https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/2fcfcc49f3b1be854bb9085993a01d17c62acf60
https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/388b303c62aa35a245f1704211a023440ad2c488
also include fix to issue introduced in above patch
(388b303c62aa35a245f1704211a023440ad2c488)
https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/93fce3f4e79cbc737d6468a4f68ba3de1b83953b
(From OE-Core rev: b68ded7dee5e6e8b8f23840e3118edcdee7e5c7e)
Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb index ff60a4240c..84e0e4457e 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb | |||
@@ -12,7 +12,9 @@ PE = "1" | |||
12 | 12 | ||
13 | SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \ | 13 | SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \ |
14 | file://disable_tests.patch \ | 14 | file://disable_tests.patch \ |
15 | file://libx11-whitespace.patch" | 15 | file://libx11-whitespace.patch \ |
16 | file://CVE-2020-14344.patch \ | ||
17 | " | ||
16 | 18 | ||
17 | SRC_URI[md5sum] = "55adbfb6d4370ecac5e70598c4e7eed2" | 19 | SRC_URI[md5sum] = "55adbfb6d4370ecac5e70598c4e7eed2" |
18 | SRC_URI[sha256sum] = "9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1" | 20 | SRC_URI[sha256sum] = "9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1" |