Stefan Dirsch
6c10e3edc4
U_CVE-2025-26594-0002-dix-keep-a-ref-to-the-rootCursor.patch * Use-after-free of the root cursor (CVE-2025-26594, bsc#1237427) - U_CVE-2025-26595-0001-xkb-Fix-buffer-overflow-in-XkbVModMaskText.patch * Buffer overflow in XkbVModMaskText() (CVE-2025-26595, bsc#1237429) - U_CVE-2025-26596-0001-xkb-Fix-computation-of-XkbSizeKeySyms.patch * Heap overflow in XkbWriteKeySyms() (CVE-2025-26596, bsc#1237430) - U_CVE-2025-26597-0001-xkb-Fix-buffer-overflow-in-XkbChangeTypesOfKey.patch * Buffer overflow in XkbChangeTypesOfKey() (CVE-2025-26597, bsc#1237431) - U_CVE-2025-26598-0001-Xi-Fix-barrier-device-search.patch * Out-of-bounds write in CreatePointerBarrierClient() (CVE-2025-26598, bsc#1237432) - U_CVE-2025-26599-0001-composite-Handle-failure-to-redirect-in-compRedirect.patch U_CVE-2025-26599-0002-composite-initialize-border-clip-even-when-pixmap-al.patch * Use of uninitialized pointer in compRedirectWindow() (CVE-2025-26599, bsc#1237433) - U_CVE-2025-26600-0001-dix-Dequeue-pending-events-on-frozen-device-on-remov.patch * Use-after-free in PlayReleasedEvents() (CVE-2025-26600, bsc#1237434) - U_CVE-2025-26601-0001-sync-Do-not-let-sync-objects-uninitialized.patch U_CVE-2025-26601-0002-sync-Check-values-before-applying-changes.patch U_CVE-2025-26601-0003-sync-Do-not-fail-SyncAddTriggerToSyncObject.patch U_CVE-2025-26601-0004-sync-Apply-changes-last-in-SyncChangeAlarmAttributes.patch * Use-after-free in SyncInitTrigger() (CVE-2025-26601, bsc#1237435) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xwayland?expand=0&rev=98
60 lines
1.8 KiB
Diff
60 lines
1.8 KiB
Diff
From 10a24e364ac15983051d0bb90817c88bbe107036 Mon Sep 17 00:00:00 2001
|
|
From: Olivier Fourdan <ofourdan@redhat.com>
|
|
Date: Tue, 17 Dec 2024 15:19:45 +0100
|
|
Subject: [PATCH xserver 1/2] composite: Handle failure to redirect in
|
|
compRedirectWindow()
|
|
|
|
The function compCheckRedirect() may fail if it cannot allocate the
|
|
backing pixmap.
|
|
|
|
In that case, compRedirectWindow() will return a BadAlloc error.
|
|
|
|
However that failure code path will shortcut the validation of the
|
|
window tree marked just before, which leaves the validate data partly
|
|
initialized.
|
|
|
|
That causes a use of uninitialized pointer later.
|
|
|
|
The fix is to not shortcut the call to compHandleMarkedWindows() even in
|
|
the case of compCheckRedirect() returning an error.
|
|
|
|
CVE-2025-26599, ZDI-CAN-25851
|
|
|
|
This vulnerability was discovered by:
|
|
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
|
|
|
|
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
---
|
|
composite/compalloc.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
Index: xwayland-24.1.4/composite/compalloc.c
|
|
===================================================================
|
|
--- xwayland-24.1.4.orig/composite/compalloc.c
|
|
+++ xwayland-24.1.4/composite/compalloc.c
|
|
@@ -140,6 +140,7 @@ compRedirectWindow(ClientPtr pClient, Wi
|
|
CompScreenPtr cs = GetCompScreen(pWin->drawable.pScreen);
|
|
WindowPtr pLayerWin;
|
|
Bool anyMarked = FALSE;
|
|
+ int status = Success;
|
|
|
|
if (pWin == cs->pOverlayWin) {
|
|
return Success;
|
|
@@ -218,13 +219,13 @@ compRedirectWindow(ClientPtr pClient, Wi
|
|
|
|
if (!compCheckRedirect(pWin)) {
|
|
FreeResource(ccw->id, RT_NONE);
|
|
- return BadAlloc;
|
|
+ status = BadAlloc;
|
|
}
|
|
|
|
if (anyMarked)
|
|
compHandleMarkedWindows(pWin, pLayerWin);
|
|
|
|
- return Success;
|
|
+ return status;
|
|
}
|
|
|
|
void
|