Stefan Dirsch
ed85a28b3f
* This release contains the fixes for the issues reported in
today's security advisory: https://lists.x.org/archives/xorg-announce/2025-February/003584.html
CVE-2025-26594, CVE-2025-26595, CVE-2025-26596, CVE-2025-26597,
CVE-2025-26598, CVE-2025-26599, CVE-2025-26600, CVE-2025-26601.
* Additionally, it reverts a recent Xkb change to fix an issue
with gamescope.
- Drop patches fixed upstream:
* U_CVE-2025-26594-0001-Cursor-Refuse-to-free-the-root-cursor.patch
* U_CVE-2025-26594-0002-dix-keep-a-ref-to-the-rootCursor.patch
* U_CVE-2025-26595-0001-xkb-Fix-buffer-overflow-in-XkbVModMaskText.patch
* U_CVE-2025-26596-0001-xkb-Fix-computation-of-XkbSizeKeySyms.patch
* U_CVE-2025-26597-0001-xkb-Fix-buffer-overflow-in-XkbChangeTypesOfKey.patch
* U_CVE-2025-26598-0001-Xi-Fix-barrier-device-search.patch
* 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
* U_CVE-2025-26600-0001-dix-Dequeue-pending-events-on-frozen-device-on-remov.patch
* 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
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xwayland?expand=0&rev=100
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From 4ccaa5134482b6be9c9a7f0b66cd221ef325d082 Mon Sep 17 00:00:00 2001
|
|
From: Olivier Fourdan <ofourdan@redhat.com>
|
|
Date: Mon, 20 Jan 2025 17:06:07 +0100
|
|
Subject: [PATCH xserver 3/4] sync: Do not fail SyncAddTriggerToSyncObject()
|
|
|
|
We do not want to return a failure at the very last step in
|
|
SyncInitTrigger() after having all changes applied.
|
|
|
|
SyncAddTriggerToSyncObject() must not fail on memory allocation, if the
|
|
allocation of the SyncTriggerList fails, trigger a FatalError() instead.
|
|
|
|
Related to CVE-2025-26601, ZDI-CAN-25870
|
|
|
|
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
---
|
|
Xext/sync.c | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Xext/sync.c b/Xext/sync.c
|
|
index 4eab5a6ac..c36de1a2e 100644
|
|
--- a/Xext/sync.c
|
|
+++ b/Xext/sync.c
|
|
@@ -200,8 +200,8 @@ SyncAddTriggerToSyncObject(SyncTrigger * pTrigger)
|
|
return Success;
|
|
}
|
|
|
|
- if (!(pCur = malloc(sizeof(SyncTriggerList))))
|
|
- return BadAlloc;
|
|
+ /* Failure is not an option, it's succeed or burst! */
|
|
+ pCur = XNFalloc(sizeof(SyncTriggerList));
|
|
|
|
pCur->pTrigger = pTrigger;
|
|
pCur->next = pTrigger->pSync->pTriglist;
|
|
@@ -409,8 +409,7 @@ SyncInitTrigger(ClientPtr client, SyncTrigger * pTrigger, XID syncObject,
|
|
* a new counter on a trigger
|
|
*/
|
|
if (newSyncObject) {
|
|
- if ((rc = SyncAddTriggerToSyncObject(pTrigger)) != Success)
|
|
- return rc;
|
|
+ SyncAddTriggerToSyncObject(pTrigger);
|
|
}
|
|
else if (pCounter && IsSystemCounter(pCounter)) {
|
|
SyncComputeBracketValues(pCounter);
|
|
--
|
|
2.48.1
|
|
|