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

dix: use BUG_WARN for input mask size issues 

Yes, we're likely corrupting memory here but really this is unlikely to be
triggered other than a real bug in the server. In which case a stacktrace is
going to be more useful than any silent error handling.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
This commit is contained in:
Peter Hutterer 2011-11-09 14:45:02 +10:00
parent 9b570ecbda
commit 27425f07b2
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dix/inpututils.c
View File

@ -972,8 +972,9 @@ xi2mask_isset(XI2Mask* mask, const DeviceIntPtr dev, int event_type)
{ {
int set = 0; int set = 0;
if (dev->id < 0 || dev->id >= mask->nmasks || event_type >= mask->mask_size) BUG_WARN(dev->id < 0);
return 0; BUG_WARN(dev->id >= mask->nmasks);
BUG_WARN(bits_to_bytes(event_type + 1) > mask->mask_size);
set = !!BitIsOn(mask->masks[XIAllDevices], event_type); set = !!BitIsOn(mask->masks[XIAllDevices], event_type);
if (!set) if (!set)
@ -990,8 +991,9 @@ xi2mask_isset(XI2Mask* mask, const DeviceIntPtr dev, int event_type)
void void
xi2mask_set(XI2Mask *mask, int deviceid, int event_type) xi2mask_set(XI2Mask *mask, int deviceid, int event_type)
{ {
if (deviceid < 0 || deviceid >= mask->nmasks || event_type >= mask->mask_size) BUG_WARN(deviceid < 0);
return; BUG_WARN(deviceid >= mask->nmasks);
BUG_WARN(bits_to_bytes(event_type + 1) > mask->mask_size);
SetBit(mask->masks[deviceid], event_type); SetBit(mask->masks[deviceid], event_type);
} }
@ -1005,8 +1007,7 @@ xi2mask_zero(XI2Mask *mask, int deviceid)
{ {
int i; int i;
if (deviceid > 0 && deviceid >= mask->nmasks) BUG_WARN(deviceid > 0 && deviceid >= mask->nmasks);
return;
if (deviceid >= 0) if (deviceid >= 0)
memset(mask->masks[deviceid], 0, mask->mask_size); memset(mask->masks[deviceid], 0, mask->mask_size);
@ -1055,8 +1056,8 @@ xi2mask_mask_size(const XI2Mask *mask)
void void
xi2mask_set_one_mask(XI2Mask *xi2mask, int deviceid, const unsigned char *mask, size_t mask_size) xi2mask_set_one_mask(XI2Mask *xi2mask, int deviceid, const unsigned char *mask, size_t mask_size)
{ {
if (deviceid < 0 || deviceid >= xi2mask->nmasks) BUG_WARN(deviceid < 0);
return; BUG_WARN(deviceid >= xi2mask->nmasks);
memcpy(xi2mask->masks[deviceid], mask, min(xi2mask->mask_size, mask_size)); memcpy(xi2mask->masks[deviceid], mask, min(xi2mask->mask_size, mask_size));
} }
@ -1067,8 +1068,8 @@ xi2mask_set_one_mask(XI2Mask *xi2mask, int deviceid, const unsigned char *mask,
const unsigned char* const unsigned char*
xi2mask_get_one_mask(const XI2Mask *mask, int deviceid) xi2mask_get_one_mask(const XI2Mask *mask, int deviceid)
{ {
if (deviceid < 0 || deviceid >= mask->nmasks) BUG_WARN(deviceid < 0);
return NULL; BUG_WARN(deviceid >= mask->nmasks);
return mask->masks[deviceid]; return mask->masks[deviceid];
} }