Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xorg-x11-server for openSUSE:Factory
checked in at 2023-03-30 22:50:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
and /work/SRC/openSUSE:Factory/.xorg-x11-server.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-server"
Thu Mar 30 22:50:52 2023 rev:418 rq:1075267 version:21.1.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes
2023-02-08 17:19:57.125842706 +0100
+++
/work/SRC/openSUSE:Factory/.xorg-x11-server.new.31432/xorg-x11-server.changes
2023-03-30 22:50:57.140473750 +0200
@@ -1,0 +2,7 @@
+Wed Mar 22 13:48:21 UTC 2023 - Stefan Dirsch <sndir...@suse.com>
+
+- U_xserver-composite-Fix-use-after-free-of-the-COW.patch
+ * overlay window use-after-free (CVE-2023-1393, ZDI-CAN-19866,
+ bsc#1209543)
+
+-------------------------------------------------------------------
New:
----
U_xserver-composite-Fix-use-after-free-of-the-COW.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.ZxB1d5/_old 2023-03-30 22:50:58.156479187 +0200
+++ /var/tmp/diff_new_pack.ZxB1d5/_new 2023-03-30 22:50:58.160479209 +0200
@@ -242,6 +242,8 @@
Patch1960: u_sync-pci-ids-with-Mesa.patch
+Patch1209543: U_xserver-composite-Fix-use-after-free-of-the-COW.patch
+
%description
This package contains the X.Org Server.
@@ -400,6 +402,8 @@
%patch1940 -p1
%patch1960 -p1
+%patch1209543 -p1
+
%build
# We have some -z now related errors during X default startup (boo#1197994):
# - when loading modesetting: gbm_bo_get_plane_count
++++++ U_xserver-composite-Fix-use-after-free-of-the-COW.patch ++++++
>From 947bd1b3f4a23565bf10879ec41ba06ebe1e1c76 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofour...@redhat.com>
Date: Mon, 13 Mar 2023 11:08:47 +0100
Subject: [PATCH xserver] composite: Fix use-after-free of the COW
ZDI-CAN-19866/CVE-2023-1393
If a client explicitly destroys the compositor overlay window (aka COW),
we would leave a dangling pointer to that window in the CompScreen
structure, which will trigger a use-after-free later.
Make sure to clear the CompScreen pointer to the COW when the latter gets
destroyed explicitly by the client.
This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Olivier Fourdan <ofour...@redhat.com>
Reviewed-by: Adam Jackson <a...@redhat.com>
---
composite/compwindow.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/composite/compwindow.c b/composite/compwindow.c
index 4e2494b86..b30da589e 100644
--- a/composite/compwindow.c
+++ b/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;
}
--
2.40.0
