patch-2.1.14 linux/drivers/char/serial.c

• Lines: 31
• Date: Sat Nov 30 10:48:34 1996
• Orig file: v2.1.13/linux/drivers/char/serial.c
• Orig date: Fri Nov 15 23:49:08 1996

diff -u --recursive --new-file v2.1.13/linux/drivers/char/serial.c linux/drivers/char/serial.c
@@ -1747,10 +1747,9 @@
 	int error;
 	unsigned int arg;
 
-	error = verify_area(VERIFY_READ, value, sizeof(int));
+	error = get_user(arg, value);
 	if (error)
 		return error;
-	get_user(arg, value);
 	switch (cmd) {
 	case TIOCMBIS: 
 		if (arg & TIOCM_RTS) {
@@ -2024,16 +2023,11 @@
 			send_break(info, arg ? arg*(HZ/10) : HZ/4);
 			return 0;
 		case TIOCGSOFTCAR:
-			error = verify_area(VERIFY_WRITE, (void *) arg,sizeof(long));
-			if (error)
-				return error;
-			put_user(C_CLOCAL(tty) ? 1 : 0, (int *) arg);
-			return 0;
+			return put_user(C_CLOCAL(tty) ? 1 : 0, (int *) arg);
 		case TIOCSSOFTCAR:
-			error = verify_area(VERIFY_READ, (void *) arg,sizeof(long));
+			error = get_user(arg, (unsigned int *) arg);
 			if (error)
 				return error;
-			get_user(arg, (unsigned int *) arg);
 			tty->termios->c_cflag =
 				((tty->termios->c_cflag & ~CLOCAL) |
 				 (arg ? CLOCAL : 0));