Module Name: xsrc
Committed By: maya
Date: Fri Jul 31 19:35:22 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server.old/dist/dix: pixmap.c
xsrc/external/mit/xorg-server/dist/dix: pixmap.c
Log Message:
Backport the only patch from xorg-server 1.20.9 as I can't find a tarball.
>From aac28e162e5108510065ad4c323affd6deffd816 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matth...@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 <matth...@herrb.eu>
Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/dix/pixmap.c
cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/external/mit/xorg-server/dist/dix/pixmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server.old/dist/dix/pixmap.c
diff -u xsrc/external/mit/xorg-server.old/dist/dix/pixmap.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/dix/pixmap.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/dix/pixmap.c:1.1.1.1 Thu Jun 9 09:07:56 2016
+++ xsrc/external/mit/xorg-server.old/dist/dix/pixmap.c Fri Jul 31 19:35:22 2020
@@ -120,7 +120,7 @@ AllocatePixmap(ScreenPtr pScreen, int pi
if (pScreen->totalPixmapSize > ((size_t)-1) - pixDataSize)
return NullPixmap;
- pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize);
+ pPixmap = calloc(1, pScreen->totalPixmapSize + pixDataSize);
if (!pPixmap)
return NullPixmap;
Index: xsrc/external/mit/xorg-server/dist/dix/pixmap.c
diff -u xsrc/external/mit/xorg-server/dist/dix/pixmap.c:1.1.1.6 xsrc/external/mit/xorg-server/dist/dix/pixmap.c:1.2
--- xsrc/external/mit/xorg-server/dist/dix/pixmap.c:1.1.1.6 Sun Feb 23 10:17:39 2020
+++ xsrc/external/mit/xorg-server/dist/dix/pixmap.c Fri Jul 31 19:35:22 2020
@@ -117,7 +117,7 @@ AllocatePixmap(ScreenPtr pScreen, int pi
if (pScreen->totalPixmapSize > ((size_t) - 1) - pixDataSize)
return NullPixmap;
- pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize);
+ pPixmap = calloc(1, pScreen->totalPixmapSize + pixDataSize);
if (!pPixmap)
return NullPixmap;
