From a1d4f04bbd46957af854bea3b23d0dcb31b38afd Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Wed, 10 Sep 2025 15:55:06 +0200 Subject: [PATCH xserver 2/4] xkb: Make the RT_XKBCLIENT resource private MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently, the resource in only available to the xkb.c source file. In preparation for the next commit, to be able to free the resources from XkbRemoveResourceClient(), make that variable private instead. This is related to: CVE-2025-62230, ZDI-CAN-27545 This vulnerability was discovered by: Jan-Niklas Sohn working with Trend Micro Zero Day Initiative Signed-off-by: Olivier Fourdan Reviewed-by: Michel Dänzer (cherry picked from commit 99790a2c9205a52fbbec01f21a92c9b7f4ed1d8f) Part-of: --- include/xkbsrv.h | 2 ++ xkb/xkb.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/xkbsrv.h b/include/xkbsrv.h index bd747856b..d801cd4b8 100644 --- a/include/xkbsrv.h +++ b/include/xkbsrv.h @@ -58,6 +58,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "inputstr.h" #include "events.h" +extern RESTYPE RT_XKBCLIENT; + typedef struct _XkbInterest { DeviceIntPtr dev; ClientPtr client; diff --git a/xkb/xkb.c b/xkb/xkb.c index ac154e200..6c102af0a 100644 --- a/xkb/xkb.c +++ b/xkb/xkb.c @@ -50,7 +50,7 @@ int XkbKeyboardErrorCode; CARD32 xkbDebugFlags = 0; static CARD32 xkbDebugCtrls = 0; -static RESTYPE RT_XKBCLIENT; +RESTYPE RT_XKBCLIENT = 0; /***====================================================================***/ -- 2.51.1