Commit a3b1f50c authored by Mariusz Kozlowski's avatar Mariusz Kozlowski Committed by Greg Kroah-Hartman
Browse files

usb: microtek possible memleak fix 



Possible memleak fix on error path. The changes:

- out_kfree2 and out_free_urb replaced
- missing scsi_host_put() added

Here it goes:

Signed-off-by: default avatarMariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: default avatarOliver Neukum <oliver@neukum.name>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 49314378

drivers/usb/image/microtek.c

+5 −3
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ static int mts_usb_probe(struct usb_interface *intf, 


	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_interface *intf, 
	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: