fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-09 14:18:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Xi: fix ProcXIGrabDevice returning AlreadyGrabbed as X error code

Browse source 
When the target device is disabled, ProcXIGrabDevice returns
AlreadyGrabbed directly as the request handler return value.
AlreadyGrabbed (1) is a grab status code, not an X error code. The
server dispatch loop interprets any non-zero return value as an X
protocol error, so the client receives BadRequest (error code 1)
instead of a proper XIGrabDevice reply with status=AlreadyGrabbed.

And use XIAlreadyGrabbed since this is an XI2 request. It's the same
value anyway.

This is the same class of bug that was fixed in ProcXIPassiveGrabDevice
by commit 'Xi: Fix XIPassiveGrab handling of keycodes > 255'

Fix by jumping to the reply path with status=AlreadyGrabbed instead of
returning the status code directly.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2186>
This commit is contained in:
Peter Hutterer 2026-04-29 05:58:14 +00:00
parent 53252ad8a9
commit 66bdc51b1c
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Xi/xigrabdev.c
View file

@ -81,8 +81,10 @@ ProcXIGrabDevice(ClientPtr client)
if (ret != Success)
return ret;
if (!dev->enabled)
return AlreadyGrabbed;
if (!dev->enabled) {
status = XIAlreadyGrabbed;
goto reply;
}
if (!IsMaster(dev))
stuff->paired_device_mode = GrabModeAsync;
@ -122,6 +124,7 @@ ProcXIGrabDevice(ClientPtr client)
if (ret != Success)
return ret;
reply:
rep = (xXIGrabDeviceReply) {
.repType = X_Reply,
.RepType = X_XIGrabDevice,