Wed Jul 24 03:22:42 2013 UTC ()
Reject drm ioctls through control minors unless explicitly allowed.


(riastradh)
diff -r1.1.2.8 -r1.1.2.9 src/sys/external/bsd/drm2/drm/drm_drv.c
cvs diff -r1.1.2.8 -r1.1.2.9 src/sys/external/bsd/drm2/drm/Attic/drm_drv.c (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/drm/Attic/drm_drv.c 2013/07/24 03:22:26 1.1.2.8
+++ src/sys/external/bsd/drm2/drm/Attic/drm_drv.c 2013/07/24 03:22:42 1.1.2.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: drm_drv.c,v 1.1.2.8 2013/07/24 03:22:26 riastradh Exp $ */ 1/* $NetBSD: drm_drv.c,v 1.1.2.9 2013/07/24 03:22:42 riastradh Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2013 The NetBSD Foundation, Inc. 4 * Copyright (c) 2013 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Taylor R. Campbell. 8 * by Taylor R. Campbell.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.1.2.8 2013/07/24 03:22:26 riastradh Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.1.2.9 2013/07/24 03:22:42 riastradh Exp $");
34 34
35#include <sys/param.h> 35#include <sys/param.h>
36#include <sys/types.h> 36#include <sys/types.h>
37#include <sys/conf.h> 37#include <sys/conf.h>
38#include <sys/device.h> 38#include <sys/device.h>
39#include <sys/file.h> 39#include <sys/file.h>
40#include <sys/filedesc.h> 40#include <sys/filedesc.h>
41#include <sys/ioccom.h> 41#include <sys/ioccom.h>
42#include <sys/kauth.h> 42#include <sys/kauth.h>
43#if 0 /* XXX drm event poll */ 43#if 0 /* XXX drm event poll */
44#include <sys/poll.h> 44#include <sys/poll.h>
45#include <sys/select.h> 45#include <sys/select.h>
46#endif 46#endif
@@ -521,26 +521,30 @@ drm_ioctl(struct file *fp, unsigned long @@ -521,26 +521,30 @@ drm_ioctl(struct file *fp, unsigned long
521 521
522 if ((ioctl == NULL) || (ioctl->func == NULL)) 522 if ((ioctl == NULL) || (ioctl->func == NULL))
523 return EINVAL; 523 return EINVAL;
524 524
525 if (ISSET(ioctl->flags, DRM_ROOT_ONLY) && !DRM_SUSER()) 525 if (ISSET(ioctl->flags, DRM_ROOT_ONLY) && !DRM_SUSER())
526 return EACCES; 526 return EACCES;
527 527
528 if (ISSET(ioctl->flags, DRM_AUTH) && !file->authenticated) 528 if (ISSET(ioctl->flags, DRM_AUTH) && !file->authenticated)
529 return EACCES; 529 return EACCES;
530 530
531 if (ISSET(ioctl->flags, DRM_MASTER) && (file->master == NULL)) 531 if (ISSET(ioctl->flags, DRM_MASTER) && (file->master == NULL))
532 return EACCES; 532 return EACCES;
533 533
 534 if (!ISSET(ioctl->flags, DRM_CONTROL_ALLOW) &&
 535 (file->minor->type == DRM_MINOR_CONTROL))
 536 return EACCES;
 537
534 atomic_inc(&dev->ioctl_count); 538 atomic_inc(&dev->ioctl_count);
535 if (!ISSET(ioctl->flags, DRM_UNLOCKED)) 539 if (!ISSET(ioctl->flags, DRM_UNLOCKED))
536 mutex_lock(&drm_global_mutex); 540 mutex_lock(&drm_global_mutex);
537 541
538 /* XXX errno Linux->NetBSD */ 542 /* XXX errno Linux->NetBSD */
539 error = -(*ioctl->func)(dev, data, file); 543 error = -(*ioctl->func)(dev, data, file);
540 544
541 if (!ISSET(ioctl->flags, DRM_UNLOCKED)) 545 if (!ISSET(ioctl->flags, DRM_UNLOCKED))
542 mutex_unlock(&drm_global_mutex); 546 mutex_unlock(&drm_global_mutex);
543 atomic_dec(&dev->ioctl_count); 547 atomic_dec(&dev->ioctl_count);
544 548
545 return error; 549 return error;
546} 550}