Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:22:42 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/drm [riastradh-drm2]: drm_drv.c
Log Message:
Reject drm ioctls through control minors unless explicitly allowed.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 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.1.2.8 src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.9
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.8 Wed Jul 24 03:22:26 2013
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Wed Jul 24 03:22:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.1.2.8 2013/07/24 03:22:26 riastradh Exp $ */
+/* $NetBSD: drm_drv.c,v 1.1.2.9 2013/07/24 03:22:42 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.1.2.8 2013/07/24 03:22:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.1.2.9 2013/07/24 03:22:42 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -531,6 +531,10 @@ drm_ioctl(struct file *fp, unsigned long
if (ISSET(ioctl->flags, DRM_MASTER) && (file->master == NULL))
return EACCES;
+ if (!ISSET(ioctl->flags, DRM_CONTROL_ALLOW) &&
+ (file->minor->type == DRM_MINOR_CONTROL))
+ return EACCES;
+
atomic_inc(&dev->ioctl_count);
if (!ISSET(ioctl->flags, DRM_UNLOCKED))
mutex_lock(&drm_global_mutex);
