Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/drm_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -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)) {