The patch titled
usb: microtek possible memleak fix
has been added to the -mm tree. Its filename is
usb-microtek-possible-memleak-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: usb: microtek possible memleak fix
From: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx>
Possible memleak fix on error path. The changes:
- out_kfree2 and out_free_urb replaced
- missing scsi_host_put() added
Signed-off-by: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/usb/image/microtek.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff -puN drivers/usb/image/microtek.c~usb-microtek-possible-memleak-fix drivers/usb/image/microtek.c
--- a/drivers/usb/image/microtek.c~usb-microtek-possible-memleak-fix
+++ a/drivers/usb/image/microtek.c
@@ -796,7 +796,7 @@ static int mts_usb_probe(struct usb_inte
new_desc->context.scsi_status = kmalloc(1, GFP_KERNEL);
if (!new_desc->context.scsi_status)
- goto out_kfree2;
+ goto out_free_urb;
new_desc->usb_dev = dev;
new_desc->usb_intf = intf;
@@ -822,18 +822,20 @@ static int mts_usb_probe(struct usb_inte
new_desc->host = scsi_host_alloc(&mts_scsi_host_template,
sizeof(new_desc));
if (!new_desc->host)
- goto out_free_urb;
+ goto out_kfree2;
new_desc->host->hostdata[0] = (unsigned long)new_desc;
if (scsi_add_host(new_desc->host, NULL)) {
err_retval = -EIO;
- goto out_free_urb;
+ goto out_host_put;
}
scsi_scan_host(new_desc->host);
usb_set_intfdata(intf, new_desc);
return 0;
+ out_host_put:
+ scsi_host_put(new_desc->host);
out_kfree2:
kfree(new_desc->context.scsi_status);
out_free_urb:
_
Patches currently in -mm which might be from m.kozlowski@xxxxxxxxxx are
origin.patch
usb-idmouse-cleanup.patch
usb-writing_usb_driver-free-urb-cleanup.patch
usb-pcwd_usb-free-urb-cleanup.patch
usb-iforce-usb-free-urb-cleanup.patch
usb-usb-gigaset-free-kill-urb-cleanup.patch
usb-cinergyt2-free-kill-urb-cleanup.patch
usb-ttusb_dec-free-urb-cleanup.patch
usb-pvrusb2-hdw-free-unlink-urb-cleanup.patch
usb-pvrusb2-io-free-urb-cleanup.patch
usb-pwc-if-free-urb-cleanup.patch
usb-quickcam_messenger-free-urb-cleanup.patch
usb-irda-usb-free-urb-cleanup.patch
usb-zd1201-free-urb-cleanup.patch
usb-ati_remote-free-urb-cleanup.patch
usb-ati_remote2-free-urb-cleanup.patch
usb-hid-core-free-urb-cleanup.patch
usb-usbkbd-free-urb-cleanup.patch
usb-auerswald-free-kill-urb-cleanup-and-memleak-fix.patch
usb-phidgetkit-free-urb-cleanup.patch
usb-legousbtower-free-kill-urb-cleanup.patch
usb-phidgetmotorcontrol-free-urb-cleanup.patch
usb-catc-free-urb-cleanup.patch
usb-ftdi_sio-kill-urb-cleanup.patch
usb-io_edgeport-kill-urb-cleanup.patch
usb-keyspan-free-urb-cleanup.patch
usb-kobil_sct-kill-urb-cleanup.patch
usb-mct_u232-free-urb-cleanup.patch
usb-navman-kill-urb-cleanup.patch
usb-usb-serial-free-urb-cleanup.patch
usb-visor-kill-urb-cleanup.patch
usb-usbmidi-kill-urb-cleanup.patch
usb-usbmixer-free-kill-urb-cleanup.patch
usb-pwc-if-loop-fix.patch
usb-ati-remote-memleak-fix.patch
usb-microtek-possible-memleak-fix.patch
i2lib-unused-variable-cleanup.patch
make-1-bit-bitfields-unsigned.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
