summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2005-02-07 22:55:54 +0000
committerDave Airlie <airlied@linux.ie>2005-02-07 22:55:54 +0000
commitdc4defe742387dc3081557111b67a1ab99455dbb (patch)
tree9741111e99704d6893c86e01b560e0867a3155c5 /linux-core
parenta36d5b33aaa7731621a288a6a9a02bf86c8c80e4 (diff)
Invalid bound check of driver defined ioctls in drm_ioctl
Bug 2489 Reporter: Aapo Tahkola <aet@rasterburn.org>
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drm_drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index 60020bb9..884cc3fa 100644
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -588,7 +588,7 @@ int drm_ioctl(struct inode *inode, struct file *filp,
if (nr < DRIVER_IOCTL_COUNT)
ioctl = &drm_ioctls[nr];
else if ((nr >= DRM_COMMAND_BASE)
- || (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls))
+ && (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls))
ioctl = &dev->driver->ioctls[nr - DRM_COMMAND_BASE];
else
goto err_i1;