Commit 55d7b689 authored May 06, 2008 by Tetsuo Handa Committed by Linus Torvalds May 08, 2008

serial: access after NULL check in uart_flush_buffer()



I noticed that

  static void uart_flush_buffer(struct tty_struct *tty)
  {
  	struct uart_state *state = tty->driver_data;
  	struct uart_port *port = state->port;
  	unsigned long flags;

  	/*
  	 * This means you called this function _after_ the port was
  	 * closed.  No cookie for you.
  	 */
  	if (!state || !state->info) {
  		WARN_ON(1);
  		return;
  	}

is too late for checking state != NULL.

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 3f9827bc

drivers/serial/serial_core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -556,7 +556,7 @@ static int uart_chars_in_buffer(struct tty_struct *tty)
		static void uart_flush_buffer(struct tty_struct *tty)
		{
		struct uart_state *state = tty->driver_data;
		struct uart_port *port = state->port;
		struct uart_port *port;
		unsigned long flags;

		/*
		@@ -568,6 +568,7 @@ static void uart_flush_buffer(struct tty_struct *tty)
		return;
		}

		port = state->port;
		pr_debug("uart_flush_buffer(%d) called\n", tty->index);

		spin_lock_irqsave(&port->lock, flags);