CVS commit: pkgsrc/x11/modular-xorg-server

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Mar 29 12:46:37 UTC 2023

Modified Files:
        pkgsrc/x11/modular-xorg-server: Makefile distinfo
Added Files:
        pkgsrc/x11/modular-xorg-server/patches: patch-composite_compwindow.c

Log Message:
modular-xorg-server: fix CVE-2023-1393

using upstream patch

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 pkgsrc/x11/modular-xorg-server/Makefile
cvs rdiff -u -r1.121 -r1.122 pkgsrc/x11/modular-xorg-server/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/modular-xorg-server/patches/patch-composite_compwindow.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/modular-xorg-server/Makefile
diff -u pkgsrc/x11/modular-xorg-server/Makefile:1.137 pkgsrc/x11/modular-xorg-server/Makefile:1.138
--- pkgsrc/x11/modular-xorg-server/Makefile:1.137       Tue Feb  7 13:53:07 2023
+++ pkgsrc/x11/modular-xorg-server/Makefile     Wed Mar 29 12:46:36 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.137 2023/02/07 13:53:07 wiz Exp $
+# $NetBSD: Makefile,v 1.138 2023/03/29 12:46:36 wiz Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-${DISTNAME}
+PKGREVISION=   1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Modular X11 server from modular X.org

Index: pkgsrc/x11/modular-xorg-server/distinfo
diff -u pkgsrc/x11/modular-xorg-server/distinfo:1.121 pkgsrc/x11/modular-xorg-server/distinfo:1.122
--- pkgsrc/x11/modular-xorg-server/distinfo:1.121       Tue Feb  7 13:53:07 2023
+++ pkgsrc/x11/modular-xorg-server/distinfo     Wed Mar 29 12:46:36 2023
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.121 2023/02/07 13:53:07 wiz Exp $
+$NetBSD: distinfo,v 1.122 2023/03/29 12:46:36 wiz Exp $
 
 BLAKE2s (xorg-server-21.1.7.tar.xz) = 3e4178506a5eec4c2062024ad11a86f51e628e2ea5327050f66352ce4b6c6513
 SHA512 (xorg-server-21.1.7.tar.xz) = e2a093381e28da9b2aa700c6609349fa851f4ca8df23c776f30e4e2733e7a6c1b257576b93f4c4e87fb09df901385bf52528982f6e7a6ad469597aeae8640bb5
 Size (xorg-server-21.1.7.tar.xz) = 4933292 bytes
+SHA1 (patch-composite_compwindow.c) = 5b8ca9a09ef59af3ebc1b1d23fbf80555314c2ac
 SHA1 (patch-configure) = 8096805cb1ac6eb25e03fdbd1d3362b720f7354e
 SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3
 SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9

Added files:

Index: pkgsrc/x11/modular-xorg-server/patches/patch-composite_compwindow.c
diff -u /dev/null pkgsrc/x11/modular-xorg-server/patches/patch-composite_compwindow.c:1.1
--- /dev/null   Wed Mar 29 12:46:37 2023
+++ pkgsrc/x11/modular-xorg-server/patches/patch-composite_compwindow.c Wed Mar 29 12:46:37 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-composite_compwindow.c,v 1.1 2023/03/29 12:46:37 wiz Exp $
+
+Fix for ZDI-CAN-19866/CVE-2023-1393
+https://gitlab.freedesktop.org/xorg/xserver/-/commit/26ef545b3
+
+--- composite/compwindow.c.orig        2023-02-07 01:16:51.000000000 +0000
++++ composite/compwindow.c
+@@ -620,6 +620,11 @@ compDestroyWindow(WindowPtr pWin)
+     ret = (*pScreen->DestroyWindow) (pWin);
+     cs->DestroyWindow = pScreen->DestroyWindow;
+     pScreen->DestroyWindow = compDestroyWindow;
++
++    /* Did we just destroy the overlay window? */
++    if (pWin == cs->pOverlayWin)
++        cs->pOverlayWin = NULL;
++
+ /*    compCheckTree (pWin->drawable.pScreen); can't check -- tree isn't good*/
+     return ret;
+ }