From dfe5d994043ce4c8009bf6be312bdfb2c0ae6a62 Mon Sep 17 00:00:00 2001 From: wangkaiqiang Date: Thu, 26 Dec 2024 11:55:06 +0800 Subject: [PATCH] composite: Fix use-after-free of the COW --- ...posite-Fix-use-after-free-of-the-COW.patch | 42 +++++++++++++++++++ xorg-x11-server.spec | 9 +++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 0001-composite-Fix-use-after-free-of-the-COW.patch diff --git a/0001-composite-Fix-use-after-free-of-the-COW.patch b/0001-composite-Fix-use-after-free-of-the-COW.patch new file mode 100644 index 0000000..bb21d7e --- /dev/null +++ b/0001-composite-Fix-use-after-free-of-the-COW.patch @@ -0,0 +1,42 @@ +From 26ef545b3502f61ca722a7a3373507e88ef64110 Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan +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 +Reviewed-by: Adam Jackson +--- + 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 + diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index ebe1e44..0e89f8a 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -47,7 +47,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.20.11 -Release: 15%{?gitdate:.%{gitdate}}%{anolis_release}%{?dist} +Release: 16%{?gitdate:.%{gitdate}}%{anolis_release}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -146,6 +146,9 @@ Patch10024: 0007-xkb-reset-the-radio_groups-pointer-to-NULL-after-fre.patch Patch10025: 0008-Xext-fix-invalid-event-type-mask-in-XTestSwapFakeInp.patch # CVE-2023-0494 Patch10026: 0001-Xi-fix-potential-use-after-free-in-DeepCopyPointerCl.patch +# upstream: 26ef545b3502f61ca722a7a3373507e88ef64110 +# CVE-2023-1393 +Patch10027: 0001-composite-Fix-use-after-free-of-the-COW.patch BuildRequires: make BuildRequires: systemtap-sdt-devel @@ -609,6 +612,10 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %changelog +* Thu Dec 26 2023 Kaiqiang Wang - 1.20.11-16.0.1 +- CVE fix for: CVE-2023-1393 + Resolves: rhbz#2180296 + * Mon May 29 2023 Hangbo Fan - 1.20.11-15.0.1 - Add doc sub package - Fix doc package installation (wangkaiyuan@inspur.com) -- Gitee