summarylogtreecommitdiffstats
path: root/0001-fix-for-ZDI-11426.patch
diff options
context:
space:
mode:
authorBrennan Tracy2020-08-06 18:48:30 -0700
committerBrennan Tracy2020-08-06 18:48:30 -0700
commit167ec4076194fa9c2dafb08fb7e00d5567e57fc0 (patch)
treeffe6943c6e35b9b3a534fd4a3943146754a802b4 /0001-fix-for-ZDI-11426.patch
downloadaur-xorg-server-sd_notify.tar.gz
Initial Commit
Diffstat (limited to '0001-fix-for-ZDI-11426.patch')
-rw-r--r--0001-fix-for-ZDI-11426.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/0001-fix-for-ZDI-11426.patch b/0001-fix-for-ZDI-11426.patch
new file mode 100644
index 000000000000..4cb699d05ab8
--- /dev/null
+++ b/0001-fix-for-ZDI-11426.patch
@@ -0,0 +1,34 @@
+From aac28e162e5108510065ad4c323affd6deffd816 Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb <matthieu@herrb.eu>
+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 <matthieu@herrb.eu>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
+---
+ 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.28.0
+