aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Starke <daniel.starke@siemens.com>2022-07-07 13:32:23 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-07-08 15:14:53 +0200
commit7e5b4322cde067e1d0f1bf8f490e93f664a7c843 (patch)
treededd8fcee6a8431c32f000862162e37bc1cf73a7
parenttty: n_gsm: fix flow control handling in tx path (diff)
downloadlinux-dev-7e5b4322cde067e1d0f1bf8f490e93f664a7c843.tar.xz
linux-dev-7e5b4322cde067e1d0f1bf8f490e93f664a7c843.zip
tty: n_gsm: fix missing corner cases in gsmld_poll()
gsmld_poll() currently fails to handle the following corner cases correctly: - remote party closed the associated tty Add the missing checks and map those to EPOLLHUP. Reorder the checks to group them by their reaction. Fixes: e1eaea46bb40 ("tty: n_gsm line discipline") Signed-off-by: Daniel Starke <daniel.starke@siemens.com> Link: https://lore.kernel.org/r/20220707113223.3685-4-daniel.starke@siemens.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/n_gsm.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 51447ccccbab..caa5c14ed57f 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -3053,12 +3053,15 @@ static __poll_t gsmld_poll(struct tty_struct *tty, struct file *file,
poll_wait(file, &tty->read_wait, wait);
poll_wait(file, &tty->write_wait, wait);
+
+ if (gsm->dead)
+ mask |= EPOLLHUP;
if (tty_hung_up_p(file))
mask |= EPOLLHUP;
+ if (test_bit(TTY_OTHER_CLOSED, &tty->flags))
+ mask |= EPOLLHUP;
if (!tty_is_writelocked(tty) && tty_write_room(tty) > 0)
mask |= EPOLLOUT | EPOLLWRNORM;
- if (gsm->dead)
- mask |= EPOLLHUP;
return mask;
}