diff options
| author | ache <ache@FreeBSD.org> | 1995-08-02 06:55:36 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1995-08-02 06:55:36 +0000 |
| commit | aa6b65d135b586d40dd8315157e6030918e8acc0 (patch) | |
| tree | b7d8fa93f5d6e0f8aee8fa03ab16f04a5d4a8a84 /sys/kern/tty.c | |
| parent | 3be0ba285f8dfff33ab10a4bdcbca121a6107028 (diff) | |
| download | FreeBSD-src-aa6b65d135b586d40dd8315157e6030918e8acc0.zip FreeBSD-src-aa6b65d135b586d40dd8315157e6030918e8acc0.tar.gz | |
Check for valid speed values in pty drive
Check for negative speed values in tty drive
Back out valid speed values checking from tty drive
Suggested by: bde
Diffstat (limited to 'sys/kern/tty.c')
| -rw-r--r-- | sys/kern/tty.c | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/sys/kern/tty.c b/sys/kern/tty.c index dc5fe3f..e8c111d 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)tty.c 8.8 (Berkeley) 1/21/94 - * $Id: tty.c,v 1.67 1995/08/01 23:27:34 ache Exp $ + * $Id: tty.c,v 1.68 1995/08/01 23:38:00 ache Exp $ */ /*- @@ -175,12 +175,6 @@ char const char_type[] = { #undef TB #undef VT -int validspeed[] = { - 0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, - 1800, 2400, 4800, 9600, 19200, 38400, 57600, 115200 -}; -#define MAX_SPEED (sizeof(validspeed)/sizeof(*validspeed) - 1) - /* Macros to clear/set/test flags. */ #define SET(t, f) (t) |= (f) #define CLR(t, f) (t) &= ~(f) @@ -829,23 +823,9 @@ ttioctl(tp, cmd, data, flag) case TIOCSETAW: /* drain output, set */ case TIOCSETAF: { /* drn out, fls in, set */ register struct termios *t = (struct termios *)data; - register int i; - for (i = MAX_SPEED; i >= 0; i--) - if (t->c_ispeed == validspeed[i]) - break; - else if (t->c_ispeed > validspeed[i]) - return (EINVAL); - if (i < 0) + if (t->c_ispeed < 0 || t->c_ospeed < 0) return (EINVAL); - for (i = MAX_SPEED; i >= 0; i--) - if (t->c_ospeed == validspeed[i]) - break; - else if (t->c_ospeed > validspeed[i]) - return (EINVAL); - if (i < 0) - return (EINVAL); - s = spltty(); if (cmd == TIOCSETAW || cmd == TIOCSETAF) { error = ttywait(tp); |
