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
81 lines
2.7 KiB
Diff
81 lines
2.7 KiB
Diff
From 7dc3f11abb51cad8a59ecbff5278c8c8a318df41 Mon Sep 17 00:00:00 2001
|
|
From: Olivier Fourdan <ofourdan@redhat.com>
|
|
Date: Mon, 20 Jan 2025 16:54:30 +0100
|
|
Subject: [PATCH xserver 2/4] sync: Check values before applying changes
|
|
|
|
In SyncInitTrigger(), we would set the CheckTrigger function before
|
|
validating the counter value.
|
|
|
|
As a result, if the counter value overflowed, we would leave the
|
|
function SyncInitTrigger() with the CheckTrigger applied but without
|
|
updating the trigger object.
|
|
|
|
To avoid that issue, move the portion of code checking for the trigger
|
|
check value before updating the CheckTrigger function.
|
|
|
|
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 | 36 ++++++++++++++++++------------------
|
|
1 file changed, 18 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/Xext/sync.c b/Xext/sync.c
|
|
index 4267d3af6..4eab5a6ac 100644
|
|
--- a/Xext/sync.c
|
|
+++ b/Xext/sync.c
|
|
@@ -351,6 +351,24 @@ SyncInitTrigger(ClientPtr client, SyncTrigger * pTrigger, XID syncObject,
|
|
}
|
|
}
|
|
|
|
+ if (changes & (XSyncCAValueType | XSyncCAValue)) {
|
|
+ if (pTrigger->value_type == XSyncAbsolute)
|
|
+ pTrigger->test_value = pTrigger->wait_value;
|
|
+ else { /* relative */
|
|
+ Bool overflow;
|
|
+
|
|
+ if (pCounter == NULL)
|
|
+ return BadMatch;
|
|
+
|
|
+ overflow = checked_int64_add(&pTrigger->test_value,
|
|
+ pCounter->value, pTrigger->wait_value);
|
|
+ if (overflow) {
|
|
+ client->errorValue = pTrigger->wait_value >> 32;
|
|
+ return BadValue;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
if (changes & XSyncCATestType) {
|
|
|
|
if (pSync && SYNC_FENCE == pSync->type) {
|
|
@@ -379,24 +397,6 @@ SyncInitTrigger(ClientPtr client, SyncTrigger * pTrigger, XID syncObject,
|
|
}
|
|
}
|
|
|
|
- if (changes & (XSyncCAValueType | XSyncCAValue)) {
|
|
- if (pTrigger->value_type == XSyncAbsolute)
|
|
- pTrigger->test_value = pTrigger->wait_value;
|
|
- else { /* relative */
|
|
- Bool overflow;
|
|
-
|
|
- if (pCounter == NULL)
|
|
- return BadMatch;
|
|
-
|
|
- overflow = checked_int64_add(&pTrigger->test_value,
|
|
- pCounter->value, pTrigger->wait_value);
|
|
- if (overflow) {
|
|
- client->errorValue = pTrigger->wait_value >> 32;
|
|
- return BadValue;
|
|
- }
|
|
- }
|
|
- }
|
|
-
|
|
if (changes & XSyncCACounter) {
|
|
if (pSync != pTrigger->pSync) { /* new counter for trigger */
|
|
SyncDeleteTriggerFromSyncObject(pTrigger);
|
|
--
|
|
2.48.1
|
|
|