820d90bbc5
Resolves: https://issues.redhat.com/browse/RHEL-80201 Resolves: https://issues.redhat.com/browse/RHEL-80186 Resolves: https://issues.redhat.com/browse/RHEL-80188 Resolves: https://issues.redhat.com/browse/RHEL-80191 Resolves: https://issues.redhat.com/browse/RHEL-80192 Resolves: https://issues.redhat.com/browse/RHEL-80199 Resolves: https://issues.redhat.com/browse/RHEL-80198 Resolves: https://issues.redhat.com/browse/RHEL-80200
50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
From 9dc8beff846a127cc8754212fb654e5f66dacff4 Mon Sep 17 00:00:00 2001
|
|
From: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Date: Wed, 4 Dec 2024 15:49:43 +1000
|
|
Subject: [PATCH xserver 02/13] dix: keep a ref to the rootCursor
|
|
|
|
CreateCursor returns a cursor with refcount 1 - that refcount is used by
|
|
the resource system, any caller needs to call RefCursor to get their own
|
|
reference. That happens correctly for normal cursors but for our
|
|
rootCursor we keep a variable to the cursor despite not having a ref for
|
|
ourselves.
|
|
|
|
Fix this by reffing/unreffing the rootCursor to ensure our pointer is
|
|
valid.
|
|
|
|
Related to CVE-2025-26594, ZDI-CAN-25544
|
|
|
|
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
(cherry picked from commit b0a09ba6020147961acc62d9c73d807b4cccd9f7)
|
|
|
|
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1831>
|
|
---
|
|
dix/main.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/dix/main.c b/dix/main.c
|
|
index b228d9c28..f2606d3d6 100644
|
|
--- a/dix/main.c
|
|
+++ b/dix/main.c
|
|
@@ -235,6 +235,8 @@ dix_main(int argc, char *argv[], char *envp[])
|
|
defaultCursorFont);
|
|
}
|
|
|
|
+ rootCursor = RefCursor(rootCursor);
|
|
+
|
|
#ifdef PANORAMIX
|
|
/*
|
|
* Consolidate window and colourmap information for each screen
|
|
@@ -275,6 +277,8 @@ dix_main(int argc, char *argv[], char *envp[])
|
|
|
|
Dispatch();
|
|
|
|
+ UnrefCursor(rootCursor);
|
|
+
|
|
UndisplayDevices();
|
|
DisableAllDevices();
|
|
|
|
--
|
|
2.48.1
|
|
|