Date: Friday, July 31, 2020 @ 16:02:43 Author: lcarlier Revision: 392781
upgpkg: xorg-server 1.20.8-3: fix CVE-2020-14347 Added: xorg-server/trunk/0001-fix-for-ZDI-11426.patch Modified: xorg-server/trunk/PKGBUILD ------------------------------+ 0001-fix-for-ZDI-11426.patch | 34 ++++++++++++++++++++++++++++++++++ PKGBUILD | 7 ++++++- 2 files changed, 40 insertions(+), 1 deletion(-) Added: 0001-fix-for-ZDI-11426.patch =================================================================== --- 0001-fix-for-ZDI-11426.patch (rev 0) +++ 0001-fix-for-ZDI-11426.patch 2020-07-31 16:02:43 UTC (rev 392781) @@ -0,0 +1,34 @@ +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> +Signed-off-by: Laurent Carlier <lordhea...@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 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-07-31 15:53:37 UTC (rev 392780) +++ PKGBUILD 2020-07-31 16:02:43 UTC (rev 392781) @@ -5,7 +5,7 @@ pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel') pkgver=1.20.8 -pkgrel=2 +pkgrel=3 arch=('x86_64') license=('custom') groups=('xorg') @@ -20,6 +20,7 @@ xserver-autobind-hotplug.patch 0001-v2-FS-58644.patch 0002-fix-libshadow-2.patch + 0001-fix-for-ZDI-11426.patch xvfb-run # with updates from FC master xvfb-run.1) validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' @@ -32,6 +33,7 @@ 'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22' '74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363' '3d3be34ad9fa976daec53573d3a30a9f1953341ba5ee27099af0141f0ef7994fa5cf84dc08aae848380e6abfc10879f9a67f07601c7a437abf8aef13a3ec9fe1' + '153ff7eed7fda7c6e28f28e514180fb0397ee984e709af95b8a9dcf6b2862191627cf725aae33d4b03f4aab2a988c2d4fa2e77e5c6a874b656c962b27cb5240b' '73c8ead9fba6815dabfec0a55b3a53f01169f6f2d14ac4a431e53b2d96028672dbd6b50a3314568847b37b1e54ea4fc02bdf677feabb3b2697af55e2e5331810' 'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22') @@ -47,6 +49,9 @@ # Fix libshadow.so: libfb.so => not found - merge in master patch -Np1 -i ../0002-fix-libshadow-2.patch + + # fix CVE-2020-14347 + patch -Np1 -i ../0001-fix-for-ZDI-11426.patch } build() {