diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-12-19 12:00:46 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-12-29 17:47:24 +1000 |
| commit | df989374a9f5356ee815baa1ba6916671a701da2 (patch) | |
| tree | 5ad70f96fa19257158f7110312303e79f3d81b79 | |
| parent | 4e74f36d08e83390121d088f1f62e3337603df89 (diff) | |
| download | kernel_samsung_smdk4412-df989374a9f5356ee815baa1ba6916671a701da2.zip kernel_samsung_smdk4412-df989374a9f5356ee815baa1ba6916671a701da2.tar.gz kernel_samsung_smdk4412-df989374a9f5356ee815baa1ba6916671a701da2.tar.bz2 | |
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>
| -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 0b9f316..c6e3382 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, retcode = -EINVAL; } else if (((ioctl->flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)) || ((ioctl->flags & DRM_AUTH) && !file_priv->authenticated) || - ((ioctl->flags & DRM_MASTER) && !file_priv->master)) { + ((ioctl->flags & DRM_MASTER) && !file_priv->is_master)) { retcode = -EACCES; } else { if (cmd & (IOC_IN | IOC_OUT)) { |