Home » Mailing list archives » linux-kernel » 2007 » November » 2

[PATCH 3/3] tty - fix tty network driver interactions with TCGET/TCSET calls

Previous thread: [PATCH 1/6] UML - Fix URLs in Kconfig and help strings by Jeff Dike on Friday, November 2, 2007 - 8:40 am. (1 message)

Next thread: [PATCH 2/3] tty - fix tty network driver interactions with TCGET/TCSET calls by Alan Cox on Friday, November 2, 2007 - 9:02 am. (2 messages)
[view original message]
From: Alan Cox
Subject: [PATCH 3/3] tty - fix tty network driver interactions with TCGET/TCSET calls
Date: Friday, November 2, 2007 - 9:00 am

From: Dave Miller <davem@davemloft.net>

And to go with it Dave's type checking x86 termios headers. I've updated these as the original sent by Dave had some wrong types in it.

Signed-off-by: Alan Cox <alan@redhat.com>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.24-rc1/include/asm-x86/termios.h linux-2.6.24-rc1/include/asm-x86/termios.h
--- linux.vanilla-2.6.24-rc1/include/asm-x86/termios.h	2007-11-01 11:42:08.000000000 +0000
+++ linux-2.6.24-rc1/include/asm-x86/termios.h	2007-11-02 12:41:44.635869768 +0000
@@ -41,6 +41,8 @@
 
 #ifdef __KERNEL__
 
+#include <asm/uaccess.h>
+
 /*	intr=^C		quit=^\		erase=del	kill=^U
 	eof=^D		vtime=\0	vmin=\1		sxtc=\0
 	start=^Q	stop=^S		susp=^Z		eol=\0
@@ -58,39 +60,53 @@
 	*(unsigned short *) &(termios)->x = __tmp; \
 }
 
-#define user_termio_to_kernel_termios(termios, termio) \
-({ \
-	SET_LOW_TERMIOS_BITS(termios, termio, c_iflag); \
-	SET_LOW_TERMIOS_BITS(termios, termio, c_oflag); \
-	SET_LOW_TERMIOS_BITS(termios, termio, c_cflag); \
-	SET_LOW_TERMIOS_BITS(termios, termio, c_lflag); \
-	copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \
-})
+static inline int user_termio_to_kernel_termios(struct ktermios *termios,
+						struct termio __user *termio)
+{
+	SET_LOW_TERMIOS_BITS(termios, termio, c_iflag);
+	SET_LOW_TERMIOS_BITS(termios, termio, c_oflag);
+	SET_LOW_TERMIOS_BITS(termios, termio, c_cflag);
+	SET_LOW_TERMIOS_BITS(termios, termio, c_lflag);
+	return copy_from_user(termios->c_cc, termio->c_cc, NCC);
+}
 
 /*
  * Translate a "termios" structure into a "termio". Ugh.
  */
-#define kernel_termios_to_user_termio(termio, termios) \
-({ \
-	put_user((termios)->c_iflag, &(termio)->c_iflag); \
-	put_user((termios)->c_oflag, &(termio)->c_oflag); \
-	put_user((termios)->c_cflag, &(termio)->c_cflag); \
-	put_user((termios)->c_lflag, &(termio)->c_lflag); \
-	put_user((termios)->c_line,  &(termio)->c_line); \
-	copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
-})
-
-#define ...
[ message continues ]
[view original message]
From: David Miller
Subject: Re: [PATCH 3/3] tty - fix tty network driver interactions with TCGET/TCSET calls
Date: Wednesday, November 7, 2007 - 2:29 am

From: Alan Cox <alan@lxorguk.ukuu.org.uk>

Also applied, thanks a lot Alan.
-


[ message continues ]
Previous thread: [PATCH 1/6] UML - Fix URLs in Kconfig and help strings by Jeff Dike on Friday, November 2, 2007 - 8:40 am. (1 message)

Next thread: [PATCH 2/3] tty - fix tty network driver interactions with TCGET/TCSET calls by Alan Cox on Friday, November 2, 2007 - 9:02 am. (2 messages)