Module Name: src
Committed By: elad
Date: Wed May 6 18:41:54 UTC 2009
Modified Files:
src/sys/arch/macppc/dev: ofb.c
src/sys/dev/pci: chipsfb.c genfb_pci.c machfb.c r128fb.c radeonfb.c
voodoofb.c
Log Message:
Replace curlwp->l_cred with kauth_cred_get().
Mailing list reference:
http://mail-index.netbsd.org/tech-kern/2009/05/05/msg005038.html
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/macppc/dev/ofb.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/chipsfb.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/genfb_pci.c \
src/sys/dev/pci/voodoofb.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/machfb.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/r128fb.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/radeonfb.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/arch/macppc/dev/ofb.c
diff -u src/sys/arch/macppc/dev/ofb.c:1.63 src/sys/arch/macppc/dev/ofb.c:1.64
--- src/sys/arch/macppc/dev/ofb.c:1.63 Mon Nov 26 19:58:29 2007
+++ src/sys/arch/macppc/dev/ofb.c Wed May 6 18:41:54 2009
@@ -1,4 +1,4 @@
-/* $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.
@@ -28,7 +28,7 @@
*/
#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>
@@ -319,7 +319,6 @@
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) {
@@ -338,13 +337,10 @@
* restrict all other mappings to processes with superuser privileges
* or the kernel itself
*/
- me = curlwp;
- if (me != NULL) {
- if (kauth_authorize_generic(me->l_cred, KAUTH_GENERIC_ISSUSER,
- NULL) != 0) {
- printf("%s: mmap() rejected.\n", sc->sc_dev.dv_xname);
- return -1;
- }
+ if (kauth_authorize_generic(kauth_cred_get(), KAUTH_GENERIC_ISSUSER,
+ NULL) != 0) {
+ printf("%s: mmap() rejected.\n", sc->sc_dev.dv_xname);
+ return -1;
}
/* let them mmap() 0xa0000 - 0xbffff if it's not covered above */
Index: src/sys/dev/pci/chipsfb.c
diff -u src/sys/dev/pci/chipsfb.c:1.17 src/sys/dev/pci/chipsfb.c:1.18
--- src/sys/dev/pci/chipsfb.c:1.17 Wed May 6 10:34:32 2009
+++ src/sys/dev/pci/chipsfb.c Wed May 6 18:41:54 2009
@@ -1,4 +1,4 @@
-/* $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
@@ -31,7 +31,7 @@
*/
#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>
@@ -865,7 +865,6 @@
{
struct vcons_data *vd = v;
struct chipsfb_softc *sc = vd->cookie;
- struct lwp *me;
paddr_t pa;
/* 'regular' framebuffer mmap()ing */
@@ -879,13 +878,10 @@
* restrict all other mappings to processes with superuser privileges
* or the kernel itself
*/
- me = curlwp;
- if (me != NULL) {
- if (kauth_authorize_generic(me->l_cred, KAUTH_GENERIC_ISSUSER,
- NULL) != 0) {
- aprint_normal_dev(&sc->sc_dev, "mmap() rejected.\n");
- return -1;
- }
+ if (kauth_authorize_generic(kauth_cred_get(), KAUTH_GENERIC_ISSUSER,
+ NULL) != 0) {
+ aprint_normal_dev(&sc->sc_dev, "mmap() rejected.\n");
+ return -1;
}
if ((offset >= sc->sc_fb) && (offset < (sc->sc_fb + sc->sc_fbsize))) {
Index: src/sys/dev/pci/genfb_pci.c
diff -u src/sys/dev/pci/genfb_pci.c:1.18 src/sys/dev/pci/genfb_pci.c:1.19
--- src/sys/dev/pci/genfb_pci.c:1.18 Wed May 6 10:34:32 2009
+++ src/sys/dev/pci/genfb_pci.c Wed May 6 18:41:54 2009
@@ -1,4 +1,4 @@
-/* $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
@@ -27,7 +27,7 @@
*/
#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>
@@ -222,7 +222,6 @@
{
struct pci_genfb_softc *sc = v;
struct range *r;
- struct lwp *me;
int i;
if (offset == 0)
@@ -247,13 +246,10 @@
* restrict all other mappings to processes with superuser privileges
* or the kernel itself
*/
- me = curlwp;
- if (me != NULL) {
- if (kauth_authorize_generic(me->l_cred, KAUTH_GENERIC_ISSUSER,
- NULL) != 0) {
- aprint_normal_dev(&sc->sc_gen.sc_dev, "mmap() rejected.\n");
- return -1;
- }
+ if (kauth_authorize_generic(kauth_cred_get(), KAUTH_GENERIC_ISSUSER,
+ NULL) != 0) {
+ aprint_normal_dev(&sc->sc_gen.sc_dev, "mmap() rejected.\n");
+ return -1;
}
#ifdef WSFB_FAKE_VGA_FB
Index: src/sys/dev/pci/voodoofb.c
diff -u src/sys/dev/pci/voodoofb.c:1.18 src/sys/dev/pci/voodoofb.c:1.19
--- src/sys/dev/pci/voodoofb.c:1.18 Wed Jul 9 15:04:21 2008
+++ src/sys/dev/pci/voodoofb.c Wed May 6 18:41:54 2009
@@ -1,4 +1,4 @@
-/* $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
@@ -32,7 +32,7 @@
*/
#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>
@@ -1002,12 +1002,10 @@
* 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, NULL) != 0) {
- aprint_error_dev(sc->sc_dev, "mmap() rejected.\n");
- return -1;
- }
+ if (kauth_authorize_generic(kauth_cred_get(), KAUTH_GENERIC_ISSUSER,
+ NULL) != 0) {
+ aprint_error_dev(sc->sc_dev, "mmap() rejected.\n");
+ return -1;
}
if ((offset >= sc->sc_fb) && (offset < (sc->sc_fb + sc->sc_fbsize))) {
Index: src/sys/dev/pci/machfb.c
diff -u src/sys/dev/pci/machfb.c:1.56 src/sys/dev/pci/machfb.c:1.57
--- src/sys/dev/pci/machfb.c:1.56 Sat Jan 3 03:43:22 2009
+++ src/sys/dev/pci/machfb.c Wed May 6 18:41:54 2009
@@ -1,4 +1,4 @@
-/* $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
@@ -33,7 +33,7 @@
#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>
@@ -1673,12 +1673,10 @@
* 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, NULL) != 0) {
- printf("%s: mmap() rejected.\n", device_xname(&sc->sc_dev));
- return -1;
- }
+ if (kauth_authorize_generic(kauth_cred_get(), KAUTH_GENERIC_ISSUSER,
+ NULL) != 0) {
+ printf("%s: mmap() rejected.\n", device_xname(&sc->sc_dev));
+ return -1;
}
reg = (pci_conf_read(sc->sc_pc, sc->sc_pcitag, 0x18) & 0xffffff00);
Index: src/sys/dev/pci/r128fb.c
diff -u src/sys/dev/pci/r128fb.c:1.7 src/sys/dev/pci/r128fb.c:1.8
--- src/sys/dev/pci/r128fb.c:1.7 Sat Jan 3 03:43:22 2009
+++ src/sys/dev/pci/r128fb.c Wed May 6 18:41:54 2009
@@ -1,4 +1,4 @@
-/* $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
@@ -31,7 +31,7 @@
*/
#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>
@@ -373,7 +373,6 @@
{
struct vcons_data *vd = v;
struct r128fb_softc *sc = vd->cookie;
- struct lwp *me;
paddr_t pa;
/* 'regular' framebuffer mmap()ing */
@@ -387,14 +386,11 @@
* restrict all other mappings to processes with superuser privileges
* or the kernel itself
*/
- me = curlwp;
- if (me != NULL) {
- if (kauth_authorize_generic(me->l_cred, KAUTH_GENERIC_ISSUSER,
- NULL) != 0) {
- aprint_normal("%s: mmap() rejected.\n",
- device_xname(sc->sc_dev));
- return -1;
- }
+ if (kauth_authorize_generic(kauth_cred_get(), KAUTH_GENERIC_ISSUSER,
+ NULL) != 0) {
+ aprint_normal("%s: mmap() rejected.\n",
+ device_xname(sc->sc_dev));
+ return -1;
}
if ((offset >= sc->sc_fb) && (offset < (sc->sc_fb + sc->sc_fbsize))) {
Index: src/sys/dev/pci/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.31 src/sys/dev/pci/radeonfb.c:1.32
--- src/sys/dev/pci/radeonfb.c:1.31 Wed May 6 10:34:33 2009
+++ src/sys/dev/pci/radeonfb.c Wed May 6 18:41:54 2009
@@ -1,4 +1,4 @@
-/* $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.
@@ -70,7 +70,7 @@
*/
#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
@@ -1061,9 +1061,6 @@
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;
@@ -1085,13 +1082,10 @@
* restrict all other mappings to processes with superuser privileges
* or the kernel itself
*/
- me = curlwp;
- if (me != NULL) {
- if (kauth_authorize_generic(me->l_cred, KAUTH_GENERIC_ISSUSER,
- NULL) != 0) {
- aprint_error_dev(&sc->sc_dev, "mmap() rejected.\n");
- return -1;
- }
+ if (kauth_authorize_generic(kauth_cred_get(), KAUTH_GENERIC_ISSUSER,
+ NULL) != 0) {
+ aprint_error_dev(&sc->sc_dev, "mmap() rejected.\n");
+ return -1;
}
if ((offset >= sc->sc_regaddr) &&
