@@ -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,17 +642,26 @@
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))