]> git.karo-electronics.de Git - linux-beck.git/commitdiff
TTY: ntty, add one more sanity check
authorJiri Slaby <jslaby@suse.cz>
Sun, 5 Jun 2011 12:16:17 +0000 (14:16 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 7 Jun 2011 17:36:47 +0000 (10:36 -0700)
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>
drivers/tty/n_tty.c

index 0ad32888091c16c1c27de4c032517df583ea4c9f..c3954fbf6ac402d7d8e8a92389c4f1ecdc065e53 100644 (file)
@@ -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);