OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
39b4d07
)
drm/vmwgfx: Fix breakage introduced by commit "drm: block userspace under allocating...
author
Thomas Hellstrom
<thellstrom@vmware.com>
Thu, 30 Sep 2010 10:18:33 +0000
(12:18 +0200)
committer
Dave Airlie
<airlied@redhat.com>
Fri, 1 Oct 2010 11:08:48 +0000
(21:08 +1000)
The mentioned commit breaks the vmwgfx ioctl argument sanity check.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index
72ec2e2
..
292aeba
100644
(file)
--- a/
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@
-500,7
+500,7
@@
static long vmw_unlocked_ioctl(struct file *filp, unsigned int cmd,
struct drm_ioctl_desc *ioctl =
&vmw_ioctls[nr - DRM_COMMAND_BASE];
- if (unlikely(ioctl->cmd != cmd)) {
+ if (unlikely(ioctl->cmd
_drv
!= cmd)) {
DRM_ERROR("Invalid command format, ioctl %d\n",
nr - DRM_COMMAND_BASE);
return -EINVAL;