mirror of
https://github.com/X11Libre/xserver.git
synced 2026-11-15 05:23:40 +00:00
Some checks are pending
Build X servers / xserver-build-ubuntu (push) Waiting to run
Build X servers / drivers-build-ubuntu (push) Waiting to run
Build X servers / xserver-build-mingw32-ubuntu (push) Waiting to run
Build X servers / xserver-build-macos (push) Waiting to run
Build X servers / xserver-build-freebsd (push) Waiting to run
Build X servers / xserver-build-dragonflybsd (push) Waiting to run
Build X servers / xserver-build-netbsd (push) Waiting to run
Build X servers / xserver-build-cygwin (push) Waiting to run
Build X servers / Release pushed tag (push) Blocked by required conditions
This was fixed in commit51eb63b0eebut woefully badly. Instead of returning XIAlreadyGrabbed via the Reply, it simply returned the value from the request handler - causing the server to interpret it as BadRequest. Fix it and do what we intended to do instead. Fixes:51eb63b0ee("Xi: disallow passive grabs with a detail > 255") Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2186> Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
362 lines
11 KiB
C
362 lines
11 KiB
C
/*
|
|
* Copyright © 2009 Red Hat, Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Author: Peter Hutterer
|
|
*/
|
|
|
|
/***********************************************************************
|
|
*
|
|
* Request to grab or ungrab input device.
|
|
*
|
|
*/
|
|
|
|
#include <dix-config.h>
|
|
|
|
#include <X11/extensions/XI2.h>
|
|
#include <X11/extensions/XI2proto.h>
|
|
|
|
#include "dix/dix_priv.h"
|
|
#include "dix/dixgrabs_priv.h"
|
|
#include "dix/exevents_priv.h"
|
|
#include "dix/inpututils_priv.h"
|
|
#include "dix/rpcbuf_priv.h"
|
|
#include "dix/request_priv.h"
|
|
#include "Xi/handlers.h"
|
|
|
|
#include "inputstr.h" /* DeviceIntPtr */
|
|
#include "windowstr.h" /* window structure */
|
|
#include "swaprep.h"
|
|
#include "exglobals.h" /* BadDevice */
|
|
#include "misc.h"
|
|
|
|
int
|
|
ProcXIPassiveGrabDevice(ClientPtr client)
|
|
{
|
|
REQUEST(xXIPassiveGrabDeviceReq);
|
|
REQUEST_AT_LEAST_SIZE(xXIPassiveGrabDeviceReq);
|
|
|
|
if (client->swapped) {
|
|
swaps(&stuff->deviceid);
|
|
swapl(&stuff->grab_window);
|
|
swapl(&stuff->cursor);
|
|
swapl(&stuff->time);
|
|
swapl(&stuff->detail);
|
|
swaps(&stuff->mask_len);
|
|
swaps(&stuff->num_modifiers);
|
|
}
|
|
|
|
REQUEST_FIXED_SIZE(xXIPassiveGrabDeviceReq,
|
|
((uint32_t) stuff->mask_len + stuff->num_modifiers) *4);
|
|
|
|
if (client->swapped) {
|
|
SwapLongs((CARD32*)&stuff[1], stuff->num_modifiers + stuff->mask_len);
|
|
}
|
|
|
|
DeviceIntPtr dev, mod_dev;
|
|
xXIPassiveGrabDeviceReply reply = {
|
|
.repType = X_Reply,
|
|
.RepType = X_XIPassiveGrabDevice,
|
|
.sequenceNumber = client->sequence,
|
|
.length = 0,
|
|
.num_modifiers = 0
|
|
};
|
|
int i, ret = Success;
|
|
uint32_t *modifiers;
|
|
GrabMask mask = { 0 };
|
|
GrabParameters param;
|
|
void *tmp;
|
|
int mask_len;
|
|
|
|
if (stuff->deviceid == XIAllDevices)
|
|
dev = inputInfo.all_devices;
|
|
else if (stuff->deviceid == XIAllMasterDevices)
|
|
dev = inputInfo.all_master_devices;
|
|
else {
|
|
ret = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess);
|
|
if (ret != Success) {
|
|
client->errorValue = stuff->deviceid;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
if (stuff->grab_type != XIGrabtypeButton &&
|
|
stuff->grab_type != XIGrabtypeKeycode &&
|
|
stuff->grab_type != XIGrabtypeEnter &&
|
|
stuff->grab_type != XIGrabtypeFocusIn &&
|
|
stuff->grab_type != XIGrabtypeTouchBegin &&
|
|
stuff->grab_type != XIGrabtypeGesturePinchBegin &&
|
|
stuff->grab_type != XIGrabtypeGestureSwipeBegin) {
|
|
client->errorValue = stuff->grab_type;
|
|
return BadValue;
|
|
}
|
|
|
|
if ((stuff->grab_type == XIGrabtypeEnter ||
|
|
stuff->grab_type == XIGrabtypeFocusIn ||
|
|
stuff->grab_type == XIGrabtypeTouchBegin ||
|
|
stuff->grab_type == XIGrabtypeGesturePinchBegin ||
|
|
stuff->grab_type == XIGrabtypeGestureSwipeBegin) && stuff->detail != 0) {
|
|
client->errorValue = stuff->detail;
|
|
return BadValue;
|
|
}
|
|
|
|
if (stuff->grab_type == XIGrabtypeTouchBegin &&
|
|
(stuff->grab_mode != XIGrabModeTouch ||
|
|
stuff->paired_device_mode != GrabModeAsync)) {
|
|
client->errorValue = stuff->grab_mode;
|
|
return BadValue;
|
|
}
|
|
|
|
if (XICheckInvalidMaskBits(client, (unsigned char *) &stuff[1],
|
|
stuff->mask_len * 4) != Success)
|
|
return BadValue;
|
|
|
|
mask.xi2mask = xi2mask_new();
|
|
if (!mask.xi2mask)
|
|
return BadAlloc;
|
|
|
|
mask_len = min(xi2mask_mask_size(mask.xi2mask), stuff->mask_len * 4);
|
|
xi2mask_set_one_mask(mask.xi2mask, stuff->deviceid,
|
|
(unsigned char *) &stuff[1], mask_len * 4);
|
|
|
|
memset(¶m, 0, sizeof(param));
|
|
param.grabtype = XI2;
|
|
param.ownerEvents = stuff->owner_events;
|
|
param.grabWindow = stuff->grab_window;
|
|
param.cursor = stuff->cursor;
|
|
|
|
if (IsKeyboardDevice(dev)) {
|
|
param.this_device_mode = stuff->grab_mode;
|
|
param.other_devices_mode = stuff->paired_device_mode;
|
|
}
|
|
else {
|
|
param.this_device_mode = stuff->paired_device_mode;
|
|
param.other_devices_mode = stuff->grab_mode;
|
|
}
|
|
|
|
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
|
|
|
|
if (stuff->cursor != None) {
|
|
ret = dixLookupResourceByType(&tmp, stuff->cursor,
|
|
X11_RESTYPE_CURSOR, client, DixUseAccess);
|
|
if (ret != Success) {
|
|
client->errorValue = stuff->cursor;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
ret =
|
|
dixLookupWindow((WindowPtr *) &tmp, stuff->grab_window, client,
|
|
DixSetAttrAccess);
|
|
if (ret != Success)
|
|
goto out;
|
|
|
|
ret = CheckGrabValues(client, ¶m);
|
|
if (ret != Success)
|
|
goto out;
|
|
|
|
modifiers = (uint32_t *) &stuff[1] + stuff->mask_len;
|
|
mod_dev = (InputDevIsFloating(dev)) ? dev : GetMaster(dev, MASTER_KEYBOARD);
|
|
|
|
for (i = 0; i < stuff->num_modifiers; i++, modifiers++) {
|
|
uint8_t status = Success;
|
|
|
|
/* XI2 allows 32-bit keycodes but thanks to XKB we can never
|
|
* implement this. Pretend that all keycodes above 255 are
|
|
* already grabbed, same for buttons > 255. */
|
|
if (stuff->detail > 255) {
|
|
status = XIAlreadyGrabbed;
|
|
goto modifier_done;
|
|
}
|
|
|
|
param.modifiers = *modifiers;
|
|
ret = CheckGrabValues(client, ¶m);
|
|
if (ret != Success)
|
|
goto out;
|
|
|
|
switch (stuff->grab_type) {
|
|
case XIGrabtypeButton:
|
|
status = GrabButton(client, dev, mod_dev, stuff->detail,
|
|
¶m, XI2, &mask);
|
|
break;
|
|
case XIGrabtypeKeycode:
|
|
status = GrabKey(client, dev, mod_dev, stuff->detail,
|
|
¶m, XI2, &mask);
|
|
break;
|
|
case XIGrabtypeEnter:
|
|
case XIGrabtypeFocusIn:
|
|
status = GrabWindow(client, dev, stuff->grab_type, ¶m, &mask);
|
|
break;
|
|
case XIGrabtypeTouchBegin:
|
|
status = GrabTouchOrGesture(client, dev, mod_dev, XI_TouchBegin,
|
|
¶m, &mask);
|
|
break;
|
|
case XIGrabtypeGesturePinchBegin:
|
|
status = GrabTouchOrGesture(client, dev, mod_dev,
|
|
XI_GesturePinchBegin, ¶m, &mask);
|
|
break;
|
|
case XIGrabtypeGestureSwipeBegin:
|
|
status = GrabTouchOrGesture(client, dev, mod_dev,
|
|
XI_GestureSwipeBegin, ¶m, &mask);
|
|
break;
|
|
}
|
|
|
|
modifier_done:
|
|
if (status != GrabSuccess) {
|
|
/* write xXIGrabModifierInfo */
|
|
x_rpcbuf_write_CARD32(&rpcbuf, *modifiers);
|
|
x_rpcbuf_write_CARD8(&rpcbuf, status);
|
|
x_rpcbuf_write_CARD8(&rpcbuf, 0); /* pad0 */
|
|
x_rpcbuf_write_CARD16(&rpcbuf, 0); /* pad1 */
|
|
|
|
reply.num_modifiers++;
|
|
}
|
|
}
|
|
|
|
xi2mask_free(&mask.xi2mask);
|
|
|
|
if (client->swapped) {
|
|
swaps(&reply.num_modifiers);
|
|
}
|
|
|
|
return X_SEND_REPLY_WITH_RPCBUF(client, reply, rpcbuf);
|
|
|
|
out:
|
|
xi2mask_free(&mask.xi2mask);
|
|
x_rpcbuf_clear(&rpcbuf);
|
|
return ret;
|
|
}
|
|
|
|
int
|
|
ProcXIPassiveUngrabDevice(ClientPtr client)
|
|
{
|
|
REQUEST(xXIPassiveUngrabDeviceReq);
|
|
REQUEST_AT_LEAST_SIZE(xXIPassiveUngrabDeviceReq);
|
|
|
|
if (client->swapped) {
|
|
swapl(&stuff->grab_window);
|
|
swaps(&stuff->deviceid);
|
|
swapl(&stuff->detail);
|
|
swaps(&stuff->num_modifiers);
|
|
}
|
|
|
|
REQUEST_FIXED_SIZE(xXIPassiveUngrabDeviceReq,
|
|
((uint32_t) stuff->num_modifiers) << 2);
|
|
|
|
if (client->swapped) {
|
|
uint32_t *modifiers = (uint32_t *) &stuff[1];
|
|
for (int i = 0; i < stuff->num_modifiers; i++, modifiers++)
|
|
swapl(modifiers);
|
|
}
|
|
|
|
DeviceIntPtr dev, mod_dev;
|
|
WindowPtr win;
|
|
GrabPtr tempGrab;
|
|
uint32_t *modifiers;
|
|
int i, rc;
|
|
|
|
if (stuff->deviceid == XIAllDevices)
|
|
dev = inputInfo.all_devices;
|
|
else if (stuff->deviceid == XIAllMasterDevices)
|
|
dev = inputInfo.all_master_devices;
|
|
else {
|
|
rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess);
|
|
if (rc != Success)
|
|
return rc;
|
|
}
|
|
|
|
if (stuff->grab_type != XIGrabtypeButton &&
|
|
stuff->grab_type != XIGrabtypeKeycode &&
|
|
stuff->grab_type != XIGrabtypeEnter &&
|
|
stuff->grab_type != XIGrabtypeFocusIn &&
|
|
stuff->grab_type != XIGrabtypeTouchBegin &&
|
|
stuff->grab_type != XIGrabtypeGesturePinchBegin &&
|
|
stuff->grab_type != XIGrabtypeGestureSwipeBegin) {
|
|
client->errorValue = stuff->grab_type;
|
|
return BadValue;
|
|
}
|
|
|
|
if ((stuff->grab_type == XIGrabtypeEnter ||
|
|
stuff->grab_type == XIGrabtypeFocusIn ||
|
|
stuff->grab_type == XIGrabtypeTouchBegin) && stuff->detail != 0) {
|
|
client->errorValue = stuff->detail;
|
|
return BadValue;
|
|
}
|
|
|
|
/* We don't allow passive grabs for details > 255 anyway */
|
|
if (stuff->detail > 255) {
|
|
client->errorValue = stuff->detail;
|
|
return BadValue;
|
|
}
|
|
|
|
rc = dixLookupWindow(&win, stuff->grab_window, client, DixSetAttrAccess);
|
|
if (rc != Success)
|
|
return rc;
|
|
|
|
mod_dev = (InputDevIsFloating(dev)) ? dev : GetMaster(dev, MASTER_KEYBOARD);
|
|
|
|
tempGrab = AllocGrab(NULL);
|
|
if (!tempGrab)
|
|
return BadAlloc;
|
|
|
|
tempGrab->resource = client->clientAsMask;
|
|
tempGrab->device = dev;
|
|
tempGrab->window = win;
|
|
switch (stuff->grab_type) {
|
|
case XIGrabtypeButton:
|
|
tempGrab->type = XI_ButtonPress;
|
|
break;
|
|
case XIGrabtypeKeycode:
|
|
tempGrab->type = XI_KeyPress;
|
|
break;
|
|
case XIGrabtypeEnter:
|
|
tempGrab->type = XI_Enter;
|
|
break;
|
|
case XIGrabtypeFocusIn:
|
|
tempGrab->type = XI_FocusIn;
|
|
break;
|
|
case XIGrabtypeTouchBegin:
|
|
tempGrab->type = XI_TouchBegin;
|
|
break;
|
|
case XIGrabtypeGesturePinchBegin:
|
|
tempGrab->type = XI_GesturePinchBegin;
|
|
break;
|
|
case XIGrabtypeGestureSwipeBegin:
|
|
tempGrab->type = XI_GestureSwipeBegin;
|
|
break;
|
|
}
|
|
tempGrab->grabtype = XI2;
|
|
tempGrab->modifierDevice = mod_dev;
|
|
tempGrab->modifiersDetail.pMask = NULL;
|
|
tempGrab->detail.exact = stuff->detail;
|
|
tempGrab->detail.pMask = NULL;
|
|
|
|
modifiers = (uint32_t *) &stuff[1];
|
|
|
|
for (i = 0; i < stuff->num_modifiers; i++, modifiers++) {
|
|
tempGrab->modifiersDetail.exact = *modifiers;
|
|
DeletePassiveGrabFromList(tempGrab);
|
|
}
|
|
|
|
FreeGrab(tempGrab);
|
|
|
|
return Success;
|
|
}
|