xserver: Branch 'xwayland-22.1' - 2 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Mar 29 13:08:09 UTC 2023
composite/compwindow.c | 5 +++++
meson.build | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit f44cdcf4660ff70ee0dc9dc1f07ea31f8548837e
Author: Olivier Fourdan <ofourdan at redhat.com>
Date: Wed Mar 29 14:00:14 2023 +0200
Bump version to 22.1.9
Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
diff --git a/meson.build b/meson.build
index c2fcede2c..f4728e8bc 100644
--- a/meson.build
+++ b/meson.build
@@ -3,10 +3,10 @@ project('xwayland', 'c',
'buildtype=debugoptimized',
'c_std=gnu99',
],
- version: '22.1.8',
+ version: '22.1.9',
meson_version: '>= 0.47.0',
)
-release_date = '2023-02-07'
+release_date = '2023-03-29'
add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc'])
cc = meson.get_compiler('c')
commit b3d05255dd1e8ece1636fb07b9461122273785ee
Author: Olivier Fourdan <ofourdan at redhat.com>
Date: Mon Mar 13 11:08:47 2023 +0100
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 <ofourdan at redhat.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
(cherry picked from commit 26ef545b3502f61ca722a7a3373507e88ef64110)
diff --git a/composite/compwindow.c b/composite/compwindow.c
index 73a1871a0..9a651636e 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;
}
More information about the xorg-commit
mailing list