frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xi: XIGetSelectedEvents mustn't returned masks from non-existing devices. 

Or devices the client doesn't have XACE permissions for.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-06-11 11:08:07 +10:00
parent 7868956b0f
commit 22b4ac44e4
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Xi/xiselectev.c
View File

@ -170,6 +170,7 @@ ProcXIGetSelectedEvents(ClientPtr client)
OtherInputMasks *masks; OtherInputMasks *masks;
InputClientsPtr others = NULL; InputClientsPtr others = NULL;
xXIEventMask *evmask = NULL; xXIEventMask *evmask = NULL;
DeviceIntPtr dev;
REQUEST(xXIGetSelectedEventsReq); REQUEST(xXIGetSelectedEventsReq);
REQUEST_SIZE_MATCH(xXIGetSelectedEventsReq); REQUEST_SIZE_MATCH(xXIGetSelectedEventsReq);
@ -211,6 +212,14 @@ ProcXIGetSelectedEvents(ClientPtr client)
int j; int j;
unsigned char *devmask = others->xi2mask[i]; unsigned char *devmask = others->xi2mask[i];
if (i > 2)
{
rc = dixLookupDevice(&dev, i, client, DixReadAccess);
if (rc != Success)
continue;
}
for (j = XI2MASKSIZE - 1; j >= 0; j--) for (j = XI2MASKSIZE - 1; j >= 0; j--)
{ {
if (devmask[j] != 0) if (devmask[j] != 0)