CVS commit: src/sys/external/bsd/drm2/drm

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Fri Mar  6 14:02:39 UTC 2015

Modified Files:
        src/sys/external/bsd/drm2/drm: drm_drv.c

Log Message:
Synchronize permission checks with upstream drm_ioctl_permit.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/drm2/drm/drm_drv.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/external/bsd/drm2/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/drm/drm_drv.c:1.13 src/sys/external/bsd/drm2/drm/drm_drv.c:1.14
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.13	Thu Jan  1 01:15:42 2015
+++ src/sys/external/bsd/drm2/drm/drm_drv.c	Fri Mar  6 14:02:39 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_drv.c,v 1.13 2015/01/01 01:15:42 mrg Exp $	*/
+/*	$NetBSD: drm_drv.c,v 1.14 2015/03/06 14:02:39 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.13 2015/01/01 01:15:42 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.14 2015/03/06 14:02:39 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -642,19 +642,28 @@ drm_ioctl(struct file *fp, unsigned long
 	if ((ioctl == NULL) || (ioctl->func == NULL))
 		return EINVAL;
 
+	/* XXX Synchronize with drm_ioctl_permit in upstream drm_drv.c.  */
 	if (ISSET(ioctl->flags, DRM_ROOT_ONLY) && !DRM_SUSER())
 		return EACCES;
 
-	if (ISSET(ioctl->flags, DRM_AUTH) && !file->authenticated)
+	if (ISSET(ioctl->flags, DRM_AUTH) &&
+	    (file->minor->type != DRM_MINOR_RENDER) &&
+	    !file->authenticated)
 		return EACCES;
 
-	if (ISSET(ioctl->flags, DRM_MASTER) && (file->master == NULL))
+	if (ISSET(ioctl->flags, DRM_MASTER) &&
+	    (file->master == NULL) &&
+	    (file->minor->type != DRM_MINOR_CONTROL))
 		return EACCES;
 
 	if (!ISSET(ioctl->flags, DRM_CONTROL_ALLOW) &&
 	    (file->minor->type == DRM_MINOR_CONTROL))
 		return EACCES;
 
+	if (!ISSET(ioctl->flags, DRM_RENDER_ALLOW) &&
+	    (file->minor->type == DRM_MINOR_RENDER))
+		return EACCES;
+
 	if (!ISSET(ioctl->flags, DRM_UNLOCKED))
 		mutex_lock(&drm_global_mutex);