Skip to content

Commit

Permalink
USB: serial: sierra driver indat_callback fix
Browse files Browse the repository at this point in the history
A crash has been reported with sierra driver on disconnect with
Ubuntu/Lucid distribution based on kernel-2.6.32.
The cause of the crash was determined as "NULL tty pointer was being
referenced" and the NULL pointer was passed by sierra_indat_callback().

This patch modifies sierra_indat_callback() function to check for NULL
tty structure pointer. This modification prevents a crash from happening
when the device is disconnected.

This patch fixes the bug reported in Launchpad:
  https://bugs.launchpad.net/ubuntu/+source/linux/+bug/511157

Signed-off-by: Elina Pasheva <epasheva@sierrawireless.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Elina Pasheva authored and Greg Kroah-Hartman committed Mar 2, 2010
1 parent 7650cd9 commit b87c6e8
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions drivers/usb/serial/sierra.c
Original file line number Diff line number Diff line change
Expand Up @@ -594,14 +594,17 @@ static void sierra_indat_callback(struct urb *urb)
} else {
if (urb->actual_length) {
tty = tty_port_tty_get(&port->port);

tty_buffer_request_room(tty, urb->actual_length);
tty_insert_flip_string(tty, data, urb->actual_length);
tty_flip_buffer_push(tty);

tty_kref_put(tty);
usb_serial_debug_data(debug, &port->dev, __func__,
urb->actual_length, data);
if (tty) {
tty_buffer_request_room(tty,
urb->actual_length);
tty_insert_flip_string(tty, data,
urb->actual_length);
tty_flip_buffer_push(tty);

tty_kref_put(tty);
usb_serial_debug_data(debug, &port->dev,
__func__, urb->actual_length, data);
}
} else {
dev_dbg(&port->dev, "%s: empty read urb"
" received\n", __func__);
Expand Down

0 comments on commit b87c6e8

Please sign in to comment.