diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-02-10 19:42:07 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-02-10 19:42:07 +0000 |
| commit | 6dfdbf4e5f4f02783bc3d43bcc87b2827fbf44bd (patch) | |
| tree | 948170cc776f70028d003e724369e96edf6f9483 /sys/dev/wscons/wsdisplay_compat_usl.c | |
| parent | 660a9e91edc56a0125f26045a71659394f9695dd (diff) | |
sync w/ netbsd; aaron@ ok
Diffstat (limited to 'sys/dev/wscons/wsdisplay_compat_usl.c')
| -rw-r--r-- | sys/dev/wscons/wsdisplay_compat_usl.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/dev/wscons/wsdisplay_compat_usl.c b/sys/dev/wscons/wsdisplay_compat_usl.c index 633ceff003f..a76c557be7f 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.3 2000/08/01 13:51:18 mickey Exp $ */ +/* $OpenBSD: wsdisplay_compat_usl.c,v 1.4 2001/02/10 19:42:06 mickey Exp $ */ /* $NetBSD: wsdisplay_compat_usl.c,v 1.12 2000/03/23 07:01:47 thorpej Exp $ */ /* @@ -322,9 +322,13 @@ wsdisplay_usl_ioctl1(sc, cmd, data, flag, p) return (0); case VT_ACTIVATE: idx = *(int *)data - 1; + if (idx < 0) + return (EINVAL); return (wsdisplay_switch((struct device *)sc, idx, 1)); case VT_WAITACTIVE: idx = *(int *)data - 1; + if (idx < 0) + return (EINVAL); return (wsscreen_switchwait(sc, idx)); case VT_GETSTATE: #define ss ((struct vt_stat *)data) @@ -369,11 +373,11 @@ wsdisplay_usl_ioctl2(sc, scr, cmd, data, flag, p) int flag; struct proc *p; { - int res; + int intarg, res; + u_long req; + void *arg; struct usl_syncdata *sd; - int req, intarg; struct wskbd_bell_data bd; - void *arg; switch (cmd) { case VT_SETMODE: |