diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-05-09 11:42:17 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-06-29 14:15:17 -0700 |
| commit | 597747c6551cd67487069415297e5eb441038321 (patch) | |
| tree | 7fafa5f8524028333fe936f3c1c916fd2bf72850 | |
| parent | 10c06ddeefccc195e70adfed664e9488eeb53804 (diff) | |
Fix a couple off-by-one array boundary checks.
Error: Write outside array bounds at Xext/geext.c:406
in function 'GEWindowSetMask' [Symbolic analysis]
In array dereference of cli->nextSib[extension] with index 'extension'
Array size is 128 elements (of 4 bytes each), index <= 128
Error: Buffer overflow at dix/events.c:592
in function 'SetMaskForEvent' [Symbolic analysis]
In array dereference of filters[deviceid] with index 'deviceid'
Array size is 20 elements (of 512 bytes each), index >= 0 and index <= 20
Error: Read buffer overflow at hw/xfree86/loader/loader.c:226
in function 'LoaderOpen' [Symbolic analysis]
In array dereference of refCount[new_handle] with index 'new_handle'
Array size is 256 elements (of 4 bytes each), index >= 1 and index <= 256
These bugs were found using the Parfait source code analysis tool.
For more information see http://research.sun.com/projects/parfait
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit b680bda34da130ce408783f04214771471e41e8d)
(cherry picked from commit 04c9e80f083659e63cffec8969fb3a0cfc551a97)
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | Xext/geext.c | 2 | ||||
| -rw-r--r-- | dix/events.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/loader/loader.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Xext/geext.c b/Xext/geext.c index a58db038e..7ab99517d 100644 --- a/Xext/geext.c +++ b/Xext/geext.c @@ -364,7 +364,7 @@ GEWindowSetMask(ClientPtr pClient, DeviceIntPtr pDev, extension = (extension & 0x7F); - if (extension > MAXEXTENSIONS) + if (extension >= MAXEXTENSIONS) { ErrorF("Invalid extension number.\n"); return; diff --git a/dix/events.c b/dix/events.c index ee6ac9e9d..f15c46090 100644 --- a/dix/events.c +++ b/dix/events.c @@ -778,7 +778,7 @@ void SetMaskForEvent(int deviceid, Mask mask, int event) { int coretype; - if (deviceid < 0 || deviceid > MAXDEVICES) + if (deviceid < 0 || deviceid >= MAXDEVICES) FatalError("SetMaskForEvent: bogus device id"); if ((event < LASTEvent) || (event >= 128)) FatalError("SetMaskForEvent: bogus event number"); diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c index a5e89127f..fc0db2886 100644 --- a/hw/xfree86/loader/loader.c +++ b/hw/xfree86/loader/loader.c @@ -249,7 +249,7 @@ LoaderOpen(const char *module, const char *cname, int handle, * Find a free handle. */ new_handle = 1; - while (freeHandles[new_handle] && new_handle < MAX_HANDLE) + while (new_handle < MAX_HANDLE && freeHandles[new_handle]) new_handle++; if (new_handle == MAX_HANDLE) { |