73c63afb93
Multiple functions in the Xinput extension handling of requests from clients failed to check that the length of the request sent by the client was large enough to perform all the required operations and thus could read or write to memory outside the bounds of the request buffer. This commit includes the creation of a new REQUEST_AT_LEAST_EXTRA_SIZE macro in include/dix.h for the common case of needing to ensure a request is large enough to include both the request itself and a minimum amount of extra data following the request header. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
108 lines
3.4 KiB
C
108 lines
3.4 KiB
C
/*
|
|
* Copyright 2007-2008 Peter Hutterer
|
|
*
|
|
* 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, University of South Australia, NICTA
|
|
*/
|
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
#include <dix-config.h>
|
|
#endif
|
|
|
|
#include <X11/X.h> /* for inputstr.h */
|
|
#include <X11/Xproto.h> /* Request macro */
|
|
#include "inputstr.h" /* DeviceIntPtr */
|
|
#include "windowstr.h" /* window structure */
|
|
#include "scrnintstr.h" /* screen structure */
|
|
#include <X11/extensions/XI.h>
|
|
#include <X11/extensions/XI2proto.h>
|
|
#include "extnsionst.h"
|
|
#include "extinit.h" /* LookupDeviceIntRec */
|
|
#include "exevents.h"
|
|
#include "exglobals.h"
|
|
|
|
#include "xigetclientpointer.h"
|
|
|
|
/***********************************************************************
|
|
* This procedure allows a client to query another client's client pointer
|
|
* setting.
|
|
*/
|
|
|
|
int
|
|
SProcXIGetClientPointer(ClientPtr client)
|
|
{
|
|
REQUEST(xXIGetClientPointerReq);
|
|
REQUEST_SIZE_MATCH(xXIGetClientPointerReq);
|
|
|
|
swaps(&stuff->length);
|
|
swapl(&stuff->win);
|
|
return ProcXIGetClientPointer(client);
|
|
}
|
|
|
|
int
|
|
ProcXIGetClientPointer(ClientPtr client)
|
|
{
|
|
int rc;
|
|
ClientPtr winclient;
|
|
xXIGetClientPointerReply rep;
|
|
|
|
REQUEST(xXIGetClientPointerReq);
|
|
REQUEST_SIZE_MATCH(xXIGetClientPointerReq);
|
|
|
|
if (stuff->win != None) {
|
|
rc = dixLookupClient(&winclient, stuff->win, client, DixGetAttrAccess);
|
|
|
|
if (rc != Success)
|
|
return BadWindow;
|
|
}
|
|
else
|
|
winclient = client;
|
|
|
|
rep = (xXIGetClientPointerReply) {
|
|
.repType = X_Reply,
|
|
.RepType = X_XIGetClientPointer,
|
|
.sequenceNumber = client->sequence,
|
|
.length = 0,
|
|
.set = (winclient->clientPtr != NULL),
|
|
.deviceid = (winclient->clientPtr) ? winclient->clientPtr->id : 0
|
|
};
|
|
|
|
WriteReplyToClient(client, sizeof(xXIGetClientPointerReply), &rep);
|
|
return Success;
|
|
}
|
|
|
|
/***********************************************************************
|
|
*
|
|
* This procedure writes the reply for the XGetClientPointer function,
|
|
* if the client and server have a different byte ordering.
|
|
*
|
|
*/
|
|
|
|
void
|
|
SRepXIGetClientPointer(ClientPtr client, int size,
|
|
xXIGetClientPointerReply * rep)
|
|
{
|
|
swaps(&rep->sequenceNumber);
|
|
swapl(&rep->length);
|
|
swaps(&rep->deviceid);
|
|
WriteToClient(client, size, rep);
|
|
}
|