diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2006-06-30 21:34:48 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-06-30 21:34:48 +0000 |
| commit | 4c0ac263ded8f53c10fafb84a0cf047c25b626d4 (patch) | |
| tree | 57686f7b047709f9d647f30076f2bb4d84dda8f2 | |
| parent | f72513fd433fa7a329df6cf05d7faffa4965313d (diff) | |
Make routines which may set PSL_IOPL consistent wrt the securelevel for
which this is allowed; ok deraadt@
| -rw-r--r-- | sys/arch/amd64/amd64/sys_machdep.c | 4 | ||||
| -rw-r--r-- | sys/dev/wscons/wsdisplay_compat_usl.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/amd64/amd64/sys_machdep.c b/sys/arch/amd64/amd64/sys_machdep.c index 19a1ff1df0d..68205737c68 100644 --- a/sys/arch/amd64/amd64/sys_machdep.c +++ b/sys/arch/amd64/amd64/sys_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_machdep.c,v 1.3 2004/02/27 23:45:55 deraadt Exp $ */ +/* $OpenBSD: sys_machdep.c,v 1.4 2006/06/30 21:34:45 miod Exp $ */ /* $NetBSD: sys_machdep.c,v 1.1 2003/04/26 18:39:32 fvdl Exp $ */ /*- @@ -299,7 +299,7 @@ amd64_iopl(struct proc *p, void *args, register_t *retval) if (!allowaperture && securelevel > 0) return EPERM; #else - if (securelevel > 1) + if (securelevel > 0) return EPERM; #endif diff --git a/sys/dev/wscons/wsdisplay_compat_usl.c b/sys/dev/wscons/wsdisplay_compat_usl.c index 5dcc87f09b6..cd1dcef5599 100644 --- a/sys/dev/wscons/wsdisplay_compat_usl.c +++ b/sys/dev/wscons/wsdisplay_compat_usl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsdisplay_compat_usl.c,v 1.15 2004/04/02 04:39:51 deraadt Exp $ */ +/* $OpenBSD: wsdisplay_compat_usl.c,v 1.16 2006/06/30 21:34:47 miod Exp $ */ /* $NetBSD: wsdisplay_compat_usl.c,v 1.12 2000/03/23 07:01:47 thorpej Exp $ */ /* @@ -341,7 +341,7 @@ wsdisplay_usl_ioctl1(sc, cmd, data, flag, p) for (idx = 0; idx <= maxidx; idx++) if (wsdisplay_screenstate(sc, idx) == EBUSY) ss->v_state |= (1 << (idx + 1)); -#undef s +#undef ss return (0); #ifdef WSDISPLAY_COMPAT_PCVT @@ -426,7 +426,7 @@ wsdisplay_usl_ioctl2(sc, scr, cmd, data, flag, p) return (0); case KDENABIO: - if (suser(p, 0) || securelevel > 1) + if (suser(p, 0) || securelevel > 0) return (EPERM); /* FALLTHRU */ case KDDISABIO: |