lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] tty_ioctl: use termios for the old structure and termios2 for the new

Browse Source 
Having split out the user and kernel structures it turns out that some non
glibc C libraries pull their termios struct from the kernel headers
directly or indirectly.  This means we must keep "struct termios" as the
library sees it correct for the old ioctls.  Not a big problem just shuffle
the names and ifdef around a bit

[akpm@osdl.org: build fix]
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Alan Cox
2006-12-08 02:38:47 -08:00
committed by Linus Torvalds
parent 606d099cdd
commit 64bb6c5e1d
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/char/tty_ioctl.c
View File

@@ -399,23 +399,27 @@ static int set_termios(struct tty_struct * tty, void __user *arg, int opt)
if (retval) if (retval)
return retval; return retval;
memcpy(&tmp_termios, tty->termios, sizeof(struct ktermios));
if (opt & TERMIOS_TERMIO) { if (opt & TERMIOS_TERMIO) {
memcpy(&tmp_termios, tty->termios, sizeof(struct ktermios));
if (user_termio_to_kernel_termios(&tmp_termios, if (user_termio_to_kernel_termios(&tmp_termios,
(struct termio __user *)arg)) (struct termio __user *)arg))
return -EFAULT; return -EFAULT;
#ifdef TCGETS2 #ifdef TCGETS2
} else if (opt & TERMIOS_OLD) { } else if (opt & TERMIOS_OLD) {
memcpy(&tmp_termios, tty->termios, sizeof(struct termios));
if (user_termios_to_kernel_termios_1(&tmp_termios, if (user_termios_to_kernel_termios_1(&tmp_termios,
(struct termios_v1 __user *)arg))
return -EFAULT;
#endif
} else {
if (user_termios_to_kernel_termios(&tmp_termios,
(struct termios __user *)arg)) (struct termios __user *)arg))
return -EFAULT; return -EFAULT;
} else {
if (user_termios_to_kernel_termios(&tmp_termios,
(struct termios2 __user *)arg))
return -EFAULT;
} }
#else
} else if (user_termios_to_kernel_termios(&tmp_termios,
(struct termios __user *)arg))
return -EFAULT;
#endif
/* If old style Bfoo values are used then load c_ispeed/c_ospeed with the real speed /* If old style Bfoo values are used then load c_ispeed/c_ospeed with the real speed
so its unconditionally usable */ so its unconditionally usable */
@@ -707,11 +711,11 @@ int n_tty_ioctl(struct tty_struct * tty, struct file * file,
return 0; return 0;
#else #else
case TCGETS: case TCGETS:
if (kernel_termios_to_user_termios_1((struct termios_v1 __user *)arg, real_tty->termios)) if (kernel_termios_to_user_termios_1((struct termios __user *)arg, real_tty->termios))
return -EFAULT; return -EFAULT;
return 0; return 0;
case TCGETS2: case TCGETS2:
if (kernel_termios_to_user_termios((struct termios __user *)arg, real_tty->termios)) if (kernel_termios_to_user_termios((struct termios2 __user *)arg, real_tty->termios))
return -EFAULT; return -EFAULT;
return 0; return 0;
case TCSETSF2: case TCSETSF2: