diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2012-11-28 21:30:01 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-29 18:15:27 -0800 |
| commit | b0ab02361167faa82198b783a8d555eb6f58901c (patch) | |
| tree | 85e0f71610c6db1dc2fbcbe5cea2fb40332920b0 | |
| parent | 218cbbd82132d48c6f4e042e31beb6019f92db01 (diff) | |
| download | linux-b0ab02361167faa82198b783a8d555eb6f58901c.tar.bz2 | |
staging: sb105x: fix potential NULL pointer dereference in mp_chars_in_buffer()
The dereference to 'state' should be moved below the NULL test.
Cc: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/sb105x/sb_pci_mp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/sb105x/sb_pci_mp.c b/drivers/staging/sb105x/sb_pci_mp.c index fbebf88226d3..edb2a85b9d52 100644 --- a/drivers/staging/sb105x/sb_pci_mp.c +++ b/drivers/staging/sb105x/sb_pci_mp.c @@ -689,13 +689,14 @@ static int mp_chars_in_buffer(struct tty_struct *tty) static void mp_flush_buffer(struct tty_struct *tty) { struct sb_uart_state *state = tty->driver_data; - struct sb_uart_port *port = state->port; + struct sb_uart_port *port; unsigned long flags; if (!state || !state->info) { return; } + port = state->port; spin_lock_irqsave(&port->lock, flags); uart_circ_clear(&state->info->xmit); spin_unlock_irqrestore(&port->lock, flags); |