diff options
author | Jiri Slaby <jslaby@suse.cz> | 2011-06-05 08:16:17 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-07 13:36:47 -0400 |
commit | 2872628680bad71a6734e7d379168f990a91cc09 (patch) | |
tree | 651549c2eba524cd8e35c61d6fafc083afdeb3fd /drivers/tty | |
parent | 92f6fa09bd453ffe3351fa1f1377a1b7cfa911e6 (diff) |
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.c | 1 |
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: | |||
1815 | /* FIXME: does n_tty_set_room need locking ? */ | 1815 | /* FIXME: does n_tty_set_room need locking ? */ |
1816 | n_tty_set_room(tty); | 1816 | n_tty_set_room(tty); |
1817 | timeout = schedule_timeout(timeout); | 1817 | timeout = schedule_timeout(timeout); |
1818 | BUG_ON(!tty->read_buf); | ||
1818 | continue; | 1819 | continue; |
1819 | } | 1820 | } |
1820 | __set_current_state(TASK_RUNNING); | 1821 | __set_current_state(TASK_RUNNING); |