summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2011-06-05 14:16:17 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-06-07 19:36:47 +0200
commit2872628680bad71a6734e7d379168f990a91cc09 (patch)
tree651549c2eba524cd8e35c61d6fafc083afdeb3fd /drivers/tty
parentTTY: ldisc, do not close until there are readers (diff)
downloadlinux-2872628680bad71a6734e7d379168f990a91cc09.tar.xz
linux-2872628680bad71a6734e7d379168f990a91cc09.zip
TTY: ntty, add one more sanity check
With the previous patch, we fixed another bug where read_buf was freed while we still was in n_tty_read. We currently check whether read_buf is NULL at the start of the function. Add one more check after we wake up from waiting for input. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/n_tty.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 0ad32888091c..c3954fbf6ac4 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -1815,6 +1815,7 @@ do_it_again:
/* FIXME: does n_tty_set_room need locking ? */
n_tty_set_room(tty);
timeout = schedule_timeout(timeout);
+ BUG_ON(!tty->read_buf);
continue;
}
__set_current_state(TASK_RUNNING);