Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'tty-4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull TTY fix from Greg KH:
"Here is a single tty fix for a reported issue that you wrote the patch
for :)
It's been in linux-next for a week or so with no reported issues"
* tag 'tty-4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
n_tty: fix EXTPROC vs ICANON interaction with TIOCINQ (aka FIONREAD)
+2
-2
+2
-2
drivers/tty/n_tty.c
+2
-2
drivers/tty/n_tty.c
···
1762
1762
{
1763
1763
struct n_tty_data *ldata = tty->disc_data;
1764
1764
1765
-
if (!old || (old->c_lflag ^ tty->termios.c_lflag) & ICANON) {
1765
+
if (!old || (old->c_lflag ^ tty->termios.c_lflag) & (ICANON | EXTPROC)) {
1766
1766
bitmap_zero(ldata->read_flags, N_TTY_BUF_SIZE);
1767
1767
ldata->line_start = ldata->read_tail;
1768
1768
if (!L_ICANON(tty) || !read_cnt(ldata)) {
···
2425
2425
return put_user(tty_chars_in_buffer(tty), (int __user *) arg);
2426
2426
case TIOCINQ:
2427
2427
down_write(&tty->termios_rwsem);
2428
-
if (L_ICANON(tty))
2428
+
if (L_ICANON(tty) && !L_EXTPROC(tty))
2429
2429
retval = inq_canon(ldata);
2430
2430
else
2431
2431
retval = read_cnt(ldata);