diff options
author | Thomas Hellstrom <thellstrom@vmware.com> | 2010-09-30 06:18:33 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-10-01 07:08:48 -0400 |
commit | 2854eedae2ff35d95e8923bebdb942bbd537c54f (patch) | |
tree | 06893883631691e415b4893a46a381251230bdb2 /drivers/gpu | |
parent | 39b4d07aa3583ceefe73622841303a0a3e942ca1 (diff) |
drm/vmwgfx: Fix breakage introduced by commit "drm: block userspace under allocating buffer and having drivers overwrite it (v2)"
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 72ec2e2b6e97..292aeba385e0 100644 --- 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, | |||
500 | struct drm_ioctl_desc *ioctl = | 500 | struct drm_ioctl_desc *ioctl = |
501 | &vmw_ioctls[nr - DRM_COMMAND_BASE]; | 501 | &vmw_ioctls[nr - DRM_COMMAND_BASE]; |
502 | 502 | ||
503 | if (unlikely(ioctl->cmd != cmd)) { | 503 | if (unlikely(ioctl->cmd_drv != cmd)) { |
504 | DRM_ERROR("Invalid command format, ioctl %d\n", | 504 | DRM_ERROR("Invalid command format, ioctl %d\n", |
505 | nr - DRM_COMMAND_BASE); | 505 | nr - DRM_COMMAND_BASE); |
506 | return -EINVAL; | 506 | return -EINVAL; |