AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

Browse Source 
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: Fix unload oops and memory leak in yealink driver
  usbserial: Reference leak
This commit is contained in:
Linus Torvalds 2006-09-12 17:32:21 -07:00
commit 3ee4b889a0
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/input/yealink.c
View File

@ -810,12 +810,9 @@ static int usb_cleanup(struct yealink_dev *yld, int err)
if (yld == NULL) if (yld == NULL)
return err; return err;
if (yld->urb_irq) { usb_kill_urb(yld->urb_irq); /* parameter validation in core/urb */
usb_kill_urb(yld->urb_irq); usb_kill_urb(yld->urb_ctl); /* parameter validation in core/urb */
usb_free_urb(yld->urb_irq);
}
if (yld->urb_ctl)
usb_free_urb(yld->urb_ctl);
if (yld->idev) { if (yld->idev) {
if (err) if (err)
input_free_device(yld->idev); input_free_device(yld->idev);
@ -831,6 +828,9 @@ static int usb_cleanup(struct yealink_dev *yld, int err)
if (yld->irq_data) if (yld->irq_data)
usb_buffer_free(yld->udev, USB_PKT_LEN, usb_buffer_free(yld->udev, USB_PKT_LEN,
yld->irq_data, yld->irq_dma); yld->irq_data, yld->irq_dma);
usb_free_urb(yld->urb_irq); /* parameter validation in core/urb */
usb_free_urb(yld->urb_ctl); /* parameter validation in core/urb */
kfree(yld); kfree(yld);
return err; return err;
} }

4
drivers/usb/serial/usb-serial.c
View File

@ -464,8 +464,10 @@ static int serial_read_proc (char *page, char **start, off_t off, int count, int
length += sprintf (page+length, " path:%s", tmp); length += sprintf (page+length, " path:%s", tmp);
length += sprintf (page+length, "\n"); length += sprintf (page+length, "\n");
if ((length + begin) > (off + count)) if ((length + begin) > (off + count)) {
usb_serial_put(serial);
goto done; goto done;
}
if ((length + begin) < off) { if ((length + begin) < off) {
begin += length; begin += length;
length = 0; length = 0;