diff options
| author | elad <elad@NetBSD.org> | 2006-05-14 21:42:26 +0000 |
|---|---|---|
| committer | elad <elad@NetBSD.org> | 2006-05-14 21:42:26 +0000 |
| commit | 2867b68bc3d7cdb1bb7b9f8367e4aa0b2fa765f4 (patch) | |
| tree | a0add7b65b60ddf03960733156c82bfb90bc978d /sys/dev/wscons | |
| parent | fc9422c9d9d5eec5abd0d58ae5fa47aedf2198e3 (diff) | |
integrate kauth.
Diffstat (limited to 'sys/dev/wscons')
| -rw-r--r-- | sys/dev/wscons/wsdisplay.c | 8 | ||||
| -rw-r--r-- | sys/dev/wscons/wsdisplay_compat_usl.c | 7 | ||||
| -rw-r--r-- | sys/dev/wscons/wsdisplay_vcons.c | 4 | ||||
| -rw-r--r-- | sys/dev/wscons/wskbd.c | 10 | ||||
| -rw-r--r-- | sys/dev/wscons/wsmouse.c | 4 |
5 files changed, 19 insertions, 14 deletions
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c index bda8c11b3d8..bbb22670608 100644 --- a/sys/dev/wscons/wsdisplay.c +++ b/sys/dev/wscons/wsdisplay.c @@ -1,4 +1,4 @@ -/* $NetBSD: wsdisplay.c,v 1.97 2006/04/15 17:48:24 jmmv Exp $ */ +/* $NetBSD: wsdisplay.c,v 1.98 2006/05/14 21:47:00 elad Exp $ */ /* * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.97 2006/04/15 17:48:24 jmmv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.98 2006/05/14 21:47:00 elad Exp $"); #include "opt_wsdisplay_compat.h" #include "opt_wsmsgattrs.h" @@ -55,6 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.97 2006/04/15 17:48:24 jmmv Exp $"); #include <sys/errno.h> #include <sys/fcntl.h> #include <sys/vnode.h> +#include <sys/kauth.h> #include <dev/wscons/wseventvar.h> #include <dev/wscons/wsmuxvar.h> @@ -756,7 +757,8 @@ wsdisplayopen(dev_t dev, int flag, int mode, struct lwp *l) wsdisplayparam(tp, &tp->t_termios); ttsetwater(tp); } else if ((tp->t_state & TS_XCLUDE) != 0 && - suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) != 0) + kauth_authorize_generic(l->l_proc->p_cred, KAUTH_GENERIC_ISSUSER, + &l->l_proc->p_acflag) != 0) return EBUSY; tp->t_state |= TS_CARR_ON; diff --git a/sys/dev/wscons/wsdisplay_compat_usl.c b/sys/dev/wscons/wsdisplay_compat_usl.c index 4b37dd11911..170f14c7ad4 100644 --- a/sys/dev/wscons/wsdisplay_compat_usl.c +++ b/sys/dev/wscons/wsdisplay_compat_usl.c @@ -1,4 +1,4 @@ -/* $NetBSD: wsdisplay_compat_usl.c,v 1.31 2006/03/18 13:06:38 jmcneill Exp $ */ +/* $NetBSD: wsdisplay_compat_usl.c,v 1.32 2006/05/14 21:47:00 elad Exp $ */ /* * Copyright (c) 1998 @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.31 2006/03/18 13:06:38 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.32 2006/05/14 21:47:00 elad Exp $"); #include "opt_compat_freebsd.h" #include "opt_compat_netbsd.h" @@ -41,6 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.31 2006/03/18 13:06:38 jm #include <sys/signalvar.h> #include <sys/malloc.h> #include <sys/errno.h> +#include <sys/kauth.h> #include <dev/wscons/wsconsio.h> #include <dev/wscons/wsdisplayvar.h> @@ -404,7 +405,7 @@ wsdisplay_usl_ioctl2(struct wsdisplay_softc *sc, struct wsscreen *scr, #undef d case KDENABIO: - if (suser(p->p_ucred, &p->p_acflag) || securelevel > 1) + if (kauth_authorize_generic(p->p_cred, KAUTH_GENERIC_ISSUSER, &p->p_acflag) || securelevel > 1) return (EPERM); /* FALLTHRU */ case KDDISABIO: diff --git a/sys/dev/wscons/wsdisplay_vcons.c b/sys/dev/wscons/wsdisplay_vcons.c index abd4d232b60..5a55cbfcaa9 100644 --- a/sys/dev/wscons/wsdisplay_vcons.c +++ b/sys/dev/wscons/wsdisplay_vcons.c @@ -1,4 +1,4 @@ -/* $NetBSD: wsdisplay_vcons.c,v 1.6 2006/04/15 17:48:24 jmmv Exp $ */ +/* $NetBSD: wsdisplay_vcons.c,v 1.7 2006/05/14 21:47:00 elad Exp $ */ /*- * Copyright (c) 2005, 2006 Michael Lorenz @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.6 2006/04/15 17:48:24 jmmv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.7 2006/05/14 21:47:00 elad Exp $"); #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c index 726293c38bf..c6432f802ff 100644 --- a/sys/dev/wscons/wskbd.c +++ b/sys/dev/wscons/wskbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: wskbd.c,v 1.91 2006/05/14 10:25:16 martin Exp $ */ +/* $NetBSD: wskbd.c,v 1.92 2006/05/14 21:47:00 elad Exp $ */ /* * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. @@ -79,7 +79,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.91 2006/05/14 10:25:16 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.92 2006/05/14 21:47:00 elad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -105,6 +105,7 @@ __KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.91 2006/05/14 10:25:16 martin Exp $"); #include <sys/errno.h> #include <sys/fcntl.h> #include <sys/vnode.h> +#include <sys/kauth.h> #include <dev/wscons/wsconsio.h> #include <dev/wscons/wskbdvar.h> @@ -1021,7 +1022,8 @@ getbell: return (0); case WSKBDIO_SETDEFAULTBELL: - if (p && (error = suser(p->p_ucred, &p->p_acflag)) != 0) + if (p && (error = kauth_authorize_generic(p->p_cred, + KAUTH_GENERIC_ISSUSER, &p->p_acflag)) != 0) return (error); kbdp = &wskbd_default_bell_data; goto setbell; @@ -1059,7 +1061,7 @@ getkeyrepeat: return (0); case WSKBDIO_SETDEFAULTKEYREPEAT: - if ((error = suser(p->p_ucred, &p->p_acflag)) != 0) + if ((error = kauth_authorize_generic(p->p_cred, KAUTH_GENERIC_ISSUSER, &p->p_acflag)) != 0) return (error); kkdp = &wskbd_default_keyrepeat_data; goto setkeyrepeat; diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c index 52c58e794dc..58b435915ac 100644 --- a/sys/dev/wscons/wsmouse.c +++ b/sys/dev/wscons/wsmouse.c @@ -1,4 +1,4 @@ -/* $NetBSD: wsmouse.c,v 1.45 2006/03/29 04:16:51 thorpej Exp $ */ +/* $NetBSD: wsmouse.c,v 1.46 2006/05/14 21:47:00 elad Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -111,7 +111,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.45 2006/03/29 04:16:51 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.46 2006/05/14 21:47:00 elad Exp $"); #include "wsmouse.h" #include "wsdisplay.h" |
