diff options
author | Li Zhou <li.zhou@windriver.com> | 2020-08-11 11:43:11 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-10 13:21:41 +0100 |
commit | f65146f02f898c01cf79263abdee5afc3c062046 (patch) | |
tree | 2d0765f234559abf2b919575f8edd639049959de /meta/recipes-graphics | |
parent | a1d518a787204b2a254d92577e66501922dd92db (diff) | |
download | poky-f65146f02f898c01cf79263abdee5afc3c062046.tar.gz |
xserver-xorg: Security Advisory - xserver-xorg - CVE-2020-14347
Backport patch from <https://gitlab.freedesktop.org/xorg/xserver/-/
commit/aac28e162e5108510065ad4c323affd6deffd816> to solve
CVE-2020-14347.
(From OE-Core rev: 850b454c090523f7f7503d4472fda77a4b2fc7a0)
Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2020-14347.patch | 37 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.5.bb | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2020-14347.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2020-14347.patch new file mode 100644 index 0000000000..20a604869b --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2020-14347.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From aac28e162e5108510065ad4c323affd6deffd816 Mon Sep 17 00:00:00 2001 | ||
2 | From: Matthieu Herrb <matthieu@herrb.eu> | ||
3 | Date: Sat, 25 Jul 2020 19:33:50 +0200 | ||
4 | Subject: [PATCH] fix for ZDI-11426 | ||
5 | |||
6 | Avoid leaking un-initalized memory to clients by zeroing the | ||
7 | whole pixmap on initial allocation. | ||
8 | |||
9 | This vulnerability was discovered by: | ||
10 | Jan-Niklas Sohn working with Trend Micro Zero Day Initiative | ||
11 | |||
12 | Signed-off-by: Matthieu Herrb <matthieu@herrb.eu> | ||
13 | Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> | ||
14 | |||
15 | Upstream-Status: Backport | ||
16 | CVE: CVE-2020-14347 | ||
17 | Signed-off-by: Li Zhou <li.zhou@windriver.com> | ||
18 | --- | ||
19 | dix/pixmap.c | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/dix/pixmap.c b/dix/pixmap.c | ||
23 | index 1186d7dbb..5a0146bbb 100644 | ||
24 | --- a/dix/pixmap.c | ||
25 | +++ b/dix/pixmap.c | ||
26 | @@ -116,7 +116,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize) | ||
27 | if (pScreen->totalPixmapSize > ((size_t) - 1) - pixDataSize) | ||
28 | return NullPixmap; | ||
29 | |||
30 | - pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize); | ||
31 | + pPixmap = calloc(1, pScreen->totalPixmapSize + pixDataSize); | ||
32 | if (!pPixmap) | ||
33 | return NullPixmap; | ||
34 | |||
35 | -- | ||
36 | 2.17.1 | ||
37 | |||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.5.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.5.bb index 3de6d22e57..f0f15a2584 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.5.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.5.bb | |||
@@ -5,6 +5,7 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat | |||
5 | file://0001-test-xtest-Initialize-array-with-braces.patch \ | 5 | file://0001-test-xtest-Initialize-array-with-braces.patch \ |
6 | file://0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch \ | 6 | file://0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch \ |
7 | file://sdksyms-no-build-path.patch \ | 7 | file://sdksyms-no-build-path.patch \ |
8 | file://CVE-2020-14347.patch \ | ||
8 | " | 9 | " |
9 | SRC_URI[md5sum] = "c9fc7e21e11286dbedd22c00df652130" | 10 | SRC_URI[md5sum] = "c9fc7e21e11286dbedd22c00df652130" |
10 | SRC_URI[sha256sum] = "a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d" | 11 | SRC_URI[sha256sum] = "a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d" |