Commit df989374 authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie

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: default avatarDave Airlie <airlied@redhat.com>
parent 4e74f36d
...@@ -493,7 +493,7 @@ int drm_ioctl(struct inode *inode, struct file *filp, ...@@ -493,7 +493,7 @@ int drm_ioctl(struct inode *inode, struct file *filp,
retcode = -EINVAL; retcode = -EINVAL;
} else if (((ioctl->flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)) || } else if (((ioctl->flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)) ||
((ioctl->flags & DRM_AUTH) && !file_priv->authenticated) || ((ioctl->flags & DRM_AUTH) && !file_priv->authenticated) ||
((ioctl->flags & DRM_MASTER) && !file_priv->master)) { ((ioctl->flags & DRM_MASTER) && !file_priv->is_master)) {
retcode = -EACCES; retcode = -EACCES;
} else { } else {
if (cmd & (IOC_IN | IOC_OUT)) { if (cmd & (IOC_IN | IOC_OUT)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment