diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-12-18 20:00:46 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-12-29 02:47:24 -0500 |
| commit | df989374a9f5356ee815baa1ba6916671a701da2 (patch) | |
| tree | 5ad70f96fa19257158f7110312303e79f3d81b79 /drivers/gpu | |
| parent | 4e74f36d08e83390121d088f1f62e3337603df89 (diff) | |
drm: fix allowing master ioctls on non-master fds.
The multi-master patches changed master to a pointer, and this fell out,
change to use is_master.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/drm_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 0b9f3164a3b2..c6e338282588 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c | |||
| @@ -493,7 +493,7 @@ int drm_ioctl(struct inode *inode, struct file *filp, | |||
| 493 | retcode = -EINVAL; | 493 | retcode = -EINVAL; |
| 494 | } else if (((ioctl->flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)) || | 494 | } else if (((ioctl->flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)) || |
| 495 | ((ioctl->flags & DRM_AUTH) && !file_priv->authenticated) || | 495 | ((ioctl->flags & DRM_AUTH) && !file_priv->authenticated) || |
| 496 | ((ioctl->flags & DRM_MASTER) && !file_priv->master)) { | 496 | ((ioctl->flags & DRM_MASTER) && !file_priv->is_master)) { |
| 497 | retcode = -EACCES; | 497 | retcode = -EACCES; |
| 498 | } else { | 498 | } else { |
| 499 | if (cmd & (IOC_IN | IOC_OUT)) { | 499 | if (cmd & (IOC_IN | IOC_OUT)) { |