UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

tty: Fix leak in ti-usb 

If the ti-usb adapter returns an zero data length frame (which happens)
then we leak a kref.  Found by Christoph Mair <christoph.mair@gmail.com>
who proposed a patch.  The patch here is different as Christoph's patch
didn't work for the case where tty = NULL and data arrived but Christoph
did all the hard work chasing it down.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alan Cox 2009-04-14 14:58:11 +01:00 committed by Linus Torvalds
parent 7a9a65ced1
commit cf5450930d
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/usb/serial/ti_usb_3410_5052.c
View File

@ -1215,20 +1215,22 @@ static void ti_bulk_in_callback(struct urb *urb)
} }
tty = tty_port_tty_get(&port->port); tty = tty_port_tty_get(&port->port);
if (tty && urb->actual_length) { if (tty) {
usb_serial_debug_data(debug, dev, __func__, if (urb->actual_length) {
urb->actual_length, urb->transfer_buffer); usb_serial_debug_data(debug, dev, __func__,
urb->actual_length, urb->transfer_buffer);
if (!tport->tp_is_open) if (!tport->tp_is_open)
dbg("%s - port closed, dropping data", __func__); dbg("%s - port closed, dropping data",
else __func__);
ti_recv(&urb->dev->dev, tty, else
ti_recv(&urb->dev->dev, tty,
urb->transfer_buffer, urb->transfer_buffer,
urb->actual_length); urb->actual_length);
spin_lock(&tport->tp_lock);
spin_lock(&tport->tp_lock); tport->tp_icount.rx += urb->actual_length;
tport->tp_icount.rx += urb->actual_length; spin_unlock(&tport->tp_lock);
spin_unlock(&tport->tp_lock); }
tty_kref_put(tty); tty_kref_put(tty);
} }