diff options
| author | Arnd Bergmann | 2009-06-11 13:42:49 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-06-11 17:50:59 +0200 |
| commit | 5b0ed5263cb089500052f8c1ab6e0706bebf0d83 (patch) | |
| tree | eafeb5d332b15691f0334aa78cfb707f3ed27c33 /arch/x86/include/asm/termios.h | |
| parent | 8250_pci: add the OXCB950 chip to the 8250 PCI driver. (diff) | |
| download | kernel-qcow2-linux-5b0ed5263cb089500052f8c1ab6e0706bebf0d83.tar.gz kernel-qcow2-linux-5b0ed5263cb089500052f8c1ab6e0706bebf0d83.tar.xz kernel-qcow2-linux-5b0ed5263cb089500052f8c1ab6e0706bebf0d83.zip | |
x86: fix ktermios-termio conversion
The legacy TCSETA{,W,F} ioctls failed to set the termio->c_line field
on x86. This adds a missing get_user.
The same ioctls also fail to report faulting user pointers, which
we keep ignoring.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/include/asm/termios.h')
| -rw-r--r-- | arch/x86/include/asm/termios.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/termios.h b/arch/x86/include/asm/termios.h index f72956331c49..c4ee8056baca 100644 --- a/arch/x86/include/asm/termios.h +++ b/arch/x86/include/asm/termios.h @@ -67,6 +67,7 @@ static inline int user_termio_to_kernel_termios(struct ktermios *termios, SET_LOW_TERMIOS_BITS(termios, termio, c_oflag); SET_LOW_TERMIOS_BITS(termios, termio, c_cflag); SET_LOW_TERMIOS_BITS(termios, termio, c_lflag); + get_user(termios->c_line, &termio->c_line); return copy_from_user(termios->c_cc, termio->c_cc, NCC); } |