From f65146f02f898c01cf79263abdee5afc3c062046 Mon Sep 17 00:00:00 2001
From: Li Zhou
Date: Tue, 11 Aug 2020 11:43:11 +0800
Subject: xserver-xorg: Security Advisory - xserver-xorg - CVE-2020-14347
Backport patch from to solve
CVE-2020-14347.
(From OE-Core rev: 850b454c090523f7f7503d4472fda77a4b2fc7a0)
Signed-off-by: Li Zhou
Signed-off-by: Anuj Mittal
Signed-off-by: Richard Purdie
---
.../xorg-xserver/xserver-xorg/CVE-2020-14347.patch | 37 ++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2020-14347.patch
(limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2020-14347.patch')
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 @@
+From aac28e162e5108510065ad4c323affd6deffd816 Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb
+Date: Sat, 25 Jul 2020 19:33:50 +0200
+Subject: [PATCH] fix for ZDI-11426
+
+Avoid leaking un-initalized memory to clients by zeroing the
+whole pixmap on initial allocation.
+
+This vulnerability was discovered by:
+Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
+
+Signed-off-by: Matthieu Herrb
+Reviewed-by: Alan Coopersmith
+
+Upstream-Status: Backport
+CVE: CVE-2020-14347
+Signed-off-by: Li Zhou
+---
+ dix/pixmap.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dix/pixmap.c b/dix/pixmap.c
+index 1186d7dbb..5a0146bbb 100644
+--- a/dix/pixmap.c
++++ b/dix/pixmap.c
+@@ -116,7 +116,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
+ if (pScreen->totalPixmapSize > ((size_t) - 1) - pixDataSize)
+ return NullPixmap;
+
+- pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize);
++ pPixmap = calloc(1, pScreen->totalPixmapSize + pixDataSize);
+ if (!pPixmap)
+ return NullPixmap;
+
+--
+2.17.1
+
--
cgit v1.2.3-54-g00ecf