diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2009-09-06 17:10:10 -0400 |
---|---|---|
committer | Live-CD User <linux@linux.site> | 2009-09-19 16:13:37 -0400 |
commit | 054f2346cb0e524cbb678759bfedabfdba4d0100 (patch) | |
tree | f27ff34eb965df9437b56614689578ce5d3dffd4 | |
parent | 7e63d0c453aa3fae714bc679f6768203b5dc9c32 (diff) |
tty: USB: serial/mct_u232, fix tty refcnt
Stanse found a tty refcnt leak in read_int_callback. In fact
it's handled wrong altogether. tty_port_tty_get can return NULL
and it's not checked in that manner.
Fix that by checking the tty_port_tty_get retval and put tty kref
properly.
http://stanse.fi.muni.cz/
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/usb/serial/mct_u232.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c index d501aefa2628..ad4998bbf16f 100644 --- a/drivers/usb/serial/mct_u232.c +++ b/drivers/usb/serial/mct_u232.c | |||
@@ -566,10 +566,13 @@ static void mct_u232_read_int_callback(struct urb *urb) | |||
566 | * Work-a-round: handle the 'usual' bulk-in pipe here | 566 | * Work-a-round: handle the 'usual' bulk-in pipe here |
567 | */ | 567 | */ |
568 | if (urb->transfer_buffer_length > 2) { | 568 | if (urb->transfer_buffer_length > 2) { |
569 | tty = tty_port_tty_get(&port->port); | ||
570 | if (urb->actual_length) { | 569 | if (urb->actual_length) { |
571 | tty_insert_flip_string(tty, data, urb->actual_length); | 570 | tty = tty_port_tty_get(&port->port); |
572 | tty_flip_buffer_push(tty); | 571 | if (tty) { |
572 | tty_insert_flip_string(tty, data, | ||
573 | urb->actual_length); | ||
574 | tty_flip_buffer_push(tty); | ||
575 | } | ||
573 | tty_kref_put(tty); | 576 | tty_kref_put(tty); |
574 | } | 577 | } |
575 | goto exit; | 578 | goto exit; |