You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
49 lines
1.7 KiB
49 lines
1.7 KiB
7 years ago
|
diff -Nru glibc-2.17-c758a686/sysdeps/unix/sysv/linux/tcsetattr.c glibc-2.17-c758a686/sysdeps/unix/sysv/linux/tcsetattr.c
|
||
|
|
--- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/tcsetattr.c 2012-06-05 07:42:49.000000000 -0600
|
||
|
|
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/tcsetattr.c 2012-06-07 12:15:21.831318623 -0600
|
||
|
|
@@ -48,6 +48,7 @@ tcsetattr (fd, optional_actions, termios
|
||
|
|
{
|
||
|
|
struct __kernel_termios k_termios;
|
||
|
|
unsigned long int cmd;
|
||
|
|
+ int retval;
|
||
|
|
|
||
|
|
switch (optional_actions)
|
||
|
|
{
|
||
|
|
@@ -79,6 +80,35 @@ tcsetattr (fd, optional_actions, termios
|
||
|
|
memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0],
|
||
|
|
__KERNEL_NCCS * sizeof (cc_t));
|
||
|
|
|
||
|
|
- return INLINE_SYSCALL (ioctl, 3, fd, cmd, &k_termios);
|
||
|
|
+ retval = INLINE_SYSCALL (ioctl, 3, fd, cmd, &k_termios);
|
||
|
|
+
|
||
|
|
+ if (retval == 0 && cmd == TCSETS)
|
||
|
|
+ {
|
||
|
|
+ /* The Linux kernel has a bug which silently ignore the invalid
|
||
|
|
+ c_cflag on pty. We have to check it here. */
|
||
|
|
+ int save = errno;
|
||
|
|
+ retval = INLINE_SYSCALL (ioctl, 3, fd, TCGETS, &k_termios);
|
||
|
|
+ if (retval)
|
||
|
|
+ {
|
||
|
|
+ /* We cannot verify if the setting is ok. We don't return
|
||
|
|
+ an error (?). */
|
||
|
|
+ __set_errno (save);
|
||
|
|
+ retval = 0;
|
||
|
|
+ }
|
||
|
|
+ else if ((termios_p->c_cflag & (PARENB | CREAD))
|
||
|
|
+ != (k_termios.c_cflag & (PARENB | CREAD))
|
||
|
|
+ || ((termios_p->c_cflag & CSIZE)
|
||
|
|
+ && ((termios_p->c_cflag & CSIZE)
|
||
|
|
+ != (k_termios.c_cflag & CSIZE))))
|
||
|
|
+ {
|
||
|
|
+ /* It looks like the Linux kernel silently changed the
|
||
|
|
+ PARENB/CREAD/CSIZE bits in c_cflag. Report it as an
|
||
|
|
+ error. */
|
||
|
|
+ __set_errno (EINVAL);
|
||
|
|
+ retval = -1;
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ return retval;
|
||
|
|
}
|
||
|
|
libc_hidden_def (tcsetattr)
|