 @@ -1,14 +1,14 @@
-/*	$NetBSD: ofb.c,v 1.63 2007/11/26 19:58:29 garbled Exp $	*/
+/*	$NetBSD: ofb.c,v 1.64 2009/05/06 18:41:54 elad Exp $	*/
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Chris G. Demetriou
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
 @@ -18,27 +18,27 @@
+ *
  * Carnegie Mellon requests users of this software to return to
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.63 2007/11/26 19:58:29 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.64 2009/05/06 18:41:54 elad Exp $");
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/kauth.h>
 #include <sys/lwp.h>
 #include <uvm/uvm_extern.h>
 @@ -309,52 +309,48 @@ ofb_ioctl(void *v, void *vs, u_long cmd,
 		return (pci_devioctl(sc->sc_pc, sc->sc_pcitag,
 		    cmd, data, flag, l));
+	}
 	return EPASSTHROUGH;
+}
 static paddr_t
 ofb_mmap(void *v, void *vs, off_t offset, int prot)
+{
 	struct vcons_data *vd = v;
 	struct ofb_softc *sc = vd->cookie;
 	struct rasops_info *ri;
 	u_int32_t *ap = sc->sc_addrs;
 	struct lwp *me;
 	int i;
 	if (vd->active == NULL) {
 		printf("%s: no active screen.\n", sc->sc_dev.dv_xname);
 		return -1;
+	}
 	ri = &vd->active->scr_ri;
 	/* framebuffer at offset 0 */
 	if ((offset >= 0) && (offset < sc->sc_fbsize))
 		return bus_space_mmap(sc->sc_memt, sc->sc_fbaddr, offset, prot,
 		    BUS_SPACE_MAP_LINEAR);
 	/*
 	 * restrict all other mappings to processes with superuser privileges
 	 * or the kernel itself
 	 */
-	me = curlwp;
+	if (kauth_authorize_generic(kauth_cred_get(), KAUTH_GENERIC_ISSUSER,
-	if (me != NULL) {
+	    NULL) != 0) {
-		if (kauth_authorize_generic(me->l_cred, KAUTH_GENERIC_ISSUSER,
+		printf("%s: mmap() rejected.\n", sc->sc_dev.dv_xname);
-		    NULL) != 0) {
+		return -1;
 			printf("%s: mmap() rejected.\n", sc->sc_dev.dv_xname);
 			return -1;
+	}
 	/* let them mmap() 0xa0000 - 0xbffff if it's not covered above */
 #ifdef OFB_FAKE_VGA_FB
 	if (offset >=0xa0000 && offset < 0xbffff)
 		return sc->sc_fbaddr + offset - 0xa0000;
 #endif
 	/* allow to map our IO space */
 	if ((offset >= 0xf2000000) && (offset < 0xf2800000)) {
 		return bus_space_mmap(sc->sc_iot, offset-0xf2000000, 0, prot,
 		    BUS_SPACE_MAP_LINEAR);
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: chipsfb.c,v 1.17 2009/05/06 10:34:32 cegger Exp $	*/
+/*	$NetBSD: chipsfb.c,v 1.18 2009/05/06 18:41:54 elad Exp $	*/
 /*
  * Copyright (c) 2006 Michael Lorenz
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * A console driver for Chips & Technologies 65550 graphics controllers
  * tested on macppc only so far
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: chipsfb.c,v 1.17 2009/05/06 10:34:32 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: chipsfb.c,v 1.18 2009/05/06 18:41:54 elad Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/callout.h>
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 #include <uvm/uvm_extern.h>
 #include <dev/videomode/videomode.h>
 @@ -855,47 +855,43 @@ chipsfb_ioctl(void *v, void *vs, u_long
+					}
+				}
+			}
 			return 0;
+	}
 	return EPASSTHROUGH;
+}
 static paddr_t
 chipsfb_mmap(void *v, void *vs, off_t offset, int prot)
+{
 	struct vcons_data *vd = v;
 	struct chipsfb_softc *sc = vd->cookie;
 	struct lwp *me;
 	paddr_t pa;
 	/* 'regular' framebuffer mmap()ing */
 	if (offset < sc->memsize) {
 		pa = bus_space_mmap(sc->sc_fbt, offset, 0, prot,
 		    BUS_SPACE_MAP_LINEAR);
 		return pa;
+	}
 	/*
 	 * restrict all other mappings to processes with superuser privileges
 	 * or the kernel itself
 	 */
-	me = curlwp;
+	if (kauth_authorize_generic(kauth_cred_get(), KAUTH_GENERIC_ISSUSER,
-	if (me != NULL) {
+	    NULL) != 0) {
-		if (kauth_authorize_generic(me->l_cred, KAUTH_GENERIC_ISSUSER,
+		aprint_normal_dev(&sc->sc_dev, "mmap() rejected.\n");
-		    NULL) != 0) {
+		return -1;
 			aprint_normal_dev(&sc->sc_dev, "mmap() rejected.\n");
 			return -1;
+	}
 	if ((offset >= sc->sc_fb) && (offset < (sc->sc_fb + sc->sc_fbsize))) {
 		pa = bus_space_mmap(sc->sc_memt, offset, 0, prot,
 		    BUS_SPACE_MAP_LINEAR);
 		return pa;
+	}
 #ifdef PCI_MAGIC_IO_RANGE
 	/* allow mapping of IO space */
 	if ((offset >= PCI_MAGIC_IO_RANGE) &&
 	    (offset < PCI_MAGIC_IO_RANGE + 0x10000)) {
 		pa = bus_space_mmap(sc->sc_iot, offset - PCI_MAGIC_IO_RANGE,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: genfb_pci.c,v 1.18 2009/05/06 10:34:32 cegger Exp $ */
+/*	$NetBSD: genfb_pci.c,v 1.19 2009/05/06 18:41:54 elad Exp $ */
 /*-
  * Copyright (c) 2007 Michael Lorenz
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.18 2009/05/06 10:34:32 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.19 2009/05/06 18:41:54 elad Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/mutex.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/kauth.h>
 #include <dev/pci/pcidevs.h>
 @@ -212,58 +212,54 @@ pci_genfb_ioctl(void *v, void *vs, u_lon
+				}
+			}
 			return 0;
+	}
 	return EPASSTHROUGH;
+}
 static paddr_t
 pci_genfb_mmap(void *v, void *vs, off_t offset, int prot)
+{
 	struct pci_genfb_softc *sc = v;
 	struct range *r;
 	struct lwp *me;
 	int i;
 	if (offset == 0)
 		sc->sc_want_wsfb = 1;
 	/*
 	 * regular fb mapping at 0
 	 * since some Sun firmware likes to put PCI resources low enough
 	 * to collide with the wsfb mapping we only allow it after asking
 	 * for offset 0
 	 */
 	DPRINTF("%s: %08x limit %08x\n", __func__, (uint32_t)offset,
 	    (uint32_t)sc->sc_gen.sc_fbsize);
 	if ((offset >= 0) && (offset < sc->sc_gen.sc_fbsize) &&
 	    (sc->sc_want_wsfb == 1)) {
 		return bus_space_mmap(sc->sc_memt, sc->sc_gen.sc_fboffset,
 		   offset, prot, BUS_SPACE_MAP_LINEAR);
+	}
 	/*
 	 * restrict all other mappings to processes with superuser privileges
 	 * or the kernel itself
 	 */
-	me = curlwp;
+	if (kauth_authorize_generic(kauth_cred_get(), KAUTH_GENERIC_ISSUSER,
-	if (me != NULL) {
+	    NULL) != 0) {
-		if (kauth_authorize_generic(me->l_cred, KAUTH_GENERIC_ISSUSER,
+		aprint_normal_dev(&sc->sc_gen.sc_dev, "mmap() rejected.\n");
-		    NULL) != 0) {
+		return -1;
 			aprint_normal_dev(&sc->sc_gen.sc_dev, "mmap() rejected.\n");
 			return -1;
+	}
 #ifdef WSFB_FAKE_VGA_FB
 	if ((offset >= 0xa0000) && (offset < 0xbffff)) {
 		return bus_space_mmap(sc->sc_memt, sc->sc_gen.sc_fboffset,
 		   offset - 0xa0000, prot, BUS_SPACE_MAP_LINEAR);
+	}
 #endif
 	/*
 	 * XXX this should be generalized, let's just
 	 * #define PCI_IOAREA_PADDR

 @@ -1,14 +1,14 @@
-/*	$NetBSD: voodoofb.c,v 1.18 2008/07/09 15:04:21 joerg Exp $	*/
+/*	$NetBSD: voodoofb.c,v 1.19 2009/05/06 18:41:54 elad Exp $	*/
 /*
  * Copyright (c) 2005, 2006 Michael Lorenz
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,27 +22,27 @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * A console driver for 3Dfx Voodoo3 graphics boards
  * Thanks to Andreas Drewke (andreas_dr@gmx.de) for his Voodoo3 driver for BeOS
  * which I used as reference / documentation
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.18 2008/07/09 15:04:21 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.19 2009/05/06 18:41:54 elad Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/callout.h>
 #include <sys/kauth.h>
 #include <uvm/uvm_extern.h>
 #if defined(macppc) || defined (sparc64) || defined(ofppc)
 #define HAVE_OPENFIRMWARE
 @@ -992,32 +992,30 @@ voodoofb_mmap(void *v, void *vs, off_t o
 	paddr_t pa;
 	/* 'regular' framebuffer mmap()ing */
 	if (offset < sc->sc_fbsize) {
 		pa = bus_space_mmap(sc->sc_fbt, offset, 0, prot,
 		    BUS_SPACE_MAP_LINEAR);
 		return pa;
+	}
 	/*
 	 * restrict all other mappings to processes with superuser privileges
 	 * or the kernel itself
 	 */
-	if (curlwp != NULL) {
+	if (kauth_authorize_generic(kauth_cred_get(), KAUTH_GENERIC_ISSUSER,
-		if (kauth_authorize_generic(kauth_cred_get(),
+	    NULL) != 0) {
-		    KAUTH_GENERIC_ISSUSER, NULL) != 0) {
+		aprint_error_dev(sc->sc_dev, "mmap() rejected.\n");
-			aprint_error_dev(sc->sc_dev, "mmap() rejected.\n");
+		return -1;
 			return -1;
+	}
 	if ((offset >= sc->sc_fb) && (offset < (sc->sc_fb + sc->sc_fbsize))) {
 		pa = bus_space_mmap(sc->sc_memt, offset, 0, prot,
 		    BUS_SPACE_MAP_LINEAR);
 		return pa;
+	}
 	if ((offset >= sc->sc_regs) && (offset < (sc->sc_regs +
 	    sc->sc_regsize))) {
 		pa = bus_space_mmap(sc->sc_memt, offset, 0, prot,
 		    BUS_SPACE_MAP_LINEAR);
 		return pa;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machfb.c,v 1.56 2009/01/03 03:43:22 yamt Exp $	*/
+/*	$NetBSD: machfb.c,v 1.57 2009/05/06 18:41:54 elad Exp $	*/
 /*
  * Copyright (c) 2002 Bang Jun-Young
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -23,27 +23,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Some code is derived from ATI Rage Pro and Derivatives Programmer's Guide.
  */
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0,
-	"$NetBSD: machfb.c,v 1.56 2009/01/03 03:43:22 yamt Exp $");
+	"$NetBSD: machfb.c,v 1.57 2009/05/06 18:41:54 elad Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/callout.h>
 #include <sys/kauth.h>
 #ifdef __sparc__
 #include <machine/promlib.h>
 #endif
 @@ -1663,32 +1663,30 @@ mach64_mmap(void *v, void *vs, off_t off
 	 * Other 64bit architectures might run into similar problems.
 	 */
 	if (offset<sc->sc_apersize) {
 		pa = bus_space_mmap(sc->sc_memt, sc->sc_aperbase, offset,
 		    prot, BUS_SPACE_MAP_LINEAR);
 		return pa;
+	}
 #endif
 	/*
 	 * restrict all other mappings to processes with superuser privileges
 	 * or the kernel itself
 	 */
-	if (curlwp != NULL) {
+	if (kauth_authorize_generic(kauth_cred_get(), KAUTH_GENERIC_ISSUSER,
-		if (kauth_authorize_generic(kauth_cred_get(),
+	    NULL) != 0) {
-		    KAUTH_GENERIC_ISSUSER, NULL) != 0) {
+		printf("%s: mmap() rejected.\n", device_xname(&sc->sc_dev));
-			printf("%s: mmap() rejected.\n", device_xname(&sc->sc_dev));
+		return -1;
 			return -1;
+	}
 	reg = (pci_conf_read(sc->sc_pc, sc->sc_pcitag, 0x18) & 0xffffff00);
 	if (reg != sc->sc_regphys) {
 #ifdef DIAGNOSTIC
 		printf("%s: BAR 0x18 changed! (%x %x)\n",
 		    device_xname(&sc->sc_dev), (uint32_t)sc->sc_regphys,
 		    (uint32_t)reg);
 #endif
 		sc->sc_regphys = reg;
+	}
 	reg = (pci_conf_read(sc->sc_pc, sc->sc_pcitag, 0x10) & 0xffffff00);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: r128fb.c,v 1.7 2009/01/03 03:43:22 yamt Exp $	*/
+/*	$NetBSD: r128fb.c,v 1.8 2009/05/06 18:41:54 elad Exp $	*/
 /*
  * Copyright (c) 2007 Michael Lorenz
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * A console driver for ATI Rage 128 graphics controllers
  * tested on macppc only so far
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.7 2009/01/03 03:43:22 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.8 2009/05/06 18:41:54 elad Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 #include <uvm/uvm_extern.h>
 #include <dev/videomode/videomode.h>
 @@ -363,48 +363,44 @@ r128fb_ioctl(void *v, void *vs, u_long c
+					}
+				}
+			}
 			return 0;
+	}
 	return EPASSTHROUGH;
+}
 static paddr_t
 r128fb_mmap(void *v, void *vs, off_t offset, int prot)
+{
 	struct vcons_data *vd = v;
 	struct r128fb_softc *sc = vd->cookie;
 	struct lwp *me;
 	paddr_t pa;
 	/* 'regular' framebuffer mmap()ing */
 	if (offset < sc->sc_fbsize) {
 		pa = bus_space_mmap(sc->sc_memt, sc->sc_fb + offset, 0, prot,
 		    BUS_SPACE_MAP_LINEAR);
 		return pa;
+	}
 	/*
 	 * restrict all other mappings to processes with superuser privileges
 	 * or the kernel itself
 	 */
-	me = curlwp;
+	if (kauth_authorize_generic(kauth_cred_get(), KAUTH_GENERIC_ISSUSER,
-	if (me != NULL) {
+	    NULL) != 0) {
-		if (kauth_authorize_generic(me->l_cred, KAUTH_GENERIC_ISSUSER,
+		aprint_normal("%s: mmap() rejected.\n",
-		    NULL) != 0) {
+		    device_xname(sc->sc_dev));
-			aprint_normal("%s: mmap() rejected.\n",
+		return -1;
 			    device_xname(sc->sc_dev));
 			return -1;
+	}
 	if ((offset >= sc->sc_fb) && (offset < (sc->sc_fb + sc->sc_fbsize))) {
 		pa = bus_space_mmap(sc->sc_memt, offset, 0, prot,
 		    BUS_SPACE_MAP_LINEAR);
 		return pa;
+	}
 	if ((offset >= sc->sc_reg) &&
 	    (offset < (sc->sc_reg + sc->sc_regsize))) {
 		pa = bus_space_mmap(sc->sc_memt, offset, 0, prot,
 		    BUS_SPACE_MAP_LINEAR);
 		return pa;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: radeonfb.c,v 1.31 2009/05/06 10:34:33 cegger Exp $ */
+/*	$NetBSD: radeonfb.c,v 1.32 2009/05/06 18:41:54 elad Exp $ */
 /*-
  * Copyright (c) 2006 Itronix Inc.
  * All rights reserved.
+ *
  * Written by Garrett D'Amore for Itronix Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -60,27 +60,27 @@
  * portions of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
  * NON-INFRINGEMENT.  IN NO EVENT SHALL ATI, VA LINUX SYSTEMS AND/OR
  * THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
  * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.31 2009/05/06 10:34:33 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.32 2009/05/06 18:41:54 elad Exp $");
 #define RADEONFB_DEFAULT_DEPTH 32
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 #include <dev/wscons/wsdisplayvar.h>
 @@ -1051,57 +1051,51 @@ radeonfb_ioctl(void *v, void *vs,
 		return (pci_devioctl(sc->sc_pc, sc->sc_pt, cmd, d, flag, l));
 	default:
 		return EPASSTHROUGH;
+	}
+}
 paddr_t
 radeonfb_mmap(void *v, void *vs, off_t offset, int prot)
+{
 	struct vcons_data	*vd;
 	struct radeonfb_display	*dp;
 	struct radeonfb_softc	*sc;
 #ifdef RADEONFB_MMAP_BARS
 	struct lwp *me;
 #endif
 	paddr_t			pa;
 	vd = (struct vcons_data *)v;
 	dp = (struct radeonfb_display *)vd->cookie;
 	sc = dp->rd_softc;
 	/* XXX: note that we don't allow mapping of registers right now */
 	/* XXX: this means that the XFree86 radeon driver won't work */
 	if ((offset >= 0) && (offset < (dp->rd_virty * dp->rd_stride))) {
 		pa = bus_space_mmap(sc->sc_memt,
 		    sc->sc_memaddr + dp->rd_offset + offset, 0,
 		    prot, BUS_SPACE_MAP_LINEAR);
 		return pa;
+	}
 #ifdef RADEONFB_MMAP_BARS
 	/*
 	 * restrict all other mappings to processes with superuser privileges
 	 * or the kernel itself
 	 */
-	me = curlwp;
+	if (kauth_authorize_generic(kauth_cred_get(), KAUTH_GENERIC_ISSUSER,
-	if (me != NULL) {
+	    NULL) != 0) {
-		if (kauth_authorize_generic(me->l_cred, KAUTH_GENERIC_ISSUSER,
+		aprint_error_dev(&sc->sc_dev, "mmap() rejected.\n");
-		    NULL) != 0) {
+		return -1;
 			aprint_error_dev(&sc->sc_dev, "mmap() rejected.\n");
 			return -1;
+	}
 	if ((offset >= sc->sc_regaddr) &&
 	    (offset < sc->sc_regaddr + sc->sc_regsz)) {
 		return bus_space_mmap(sc->sc_regt, offset, 0, prot,
 		    BUS_SPACE_MAP_LINEAR);
+	}
 	if ((offset >= sc->sc_memaddr) &&
 	    (offset < sc->sc_memaddr + sc->sc_memsz)) {
 		return bus_space_mmap(sc->sc_memt, offset, 0, prot,
 		    BUS_SPACE_MAP_LINEAR);
+	}