[PATCH: usbatm_15_05_05] usbatm_usb_probe() bugfix.

Duncan Sands baldrick at free.fr
Fri May 27 04:07:07 EDT 2005


Hi Stanislaw,

> I found bug generating oops in usbatm_usb_probe() when bind fail. 
> Also I fix memory lackage, which occurs on very special case.

well spotted!  I've sent a modified version of your patch upstream,
so it should turn up in -mm soon.

Thanks a lot,

Duncan.

--- Linux/drivers/usb/atm/usbatm.c.orig	2005-05-27 09:55:36.240188096 +0200
+++ Linux/drivers/usb/atm/usbatm.c	2005-05-27 09:55:45.119808755 +0200
@@ -949,6 +949,7 @@
 	struct usb_device *usb_dev = interface_to_usbdev(intf);
 	struct usbatm_data *instance;
 	char *buf;
+	size_t instance_size = sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs);
 	int error = -ENOMEM;
 	int i, length;
 	int need_heavy;
@@ -960,14 +961,13 @@
 			intf->altsetting->desc.bInterfaceNumber);
 
 	/* instance init */
-	instance = kmalloc(sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs),
-			   GFP_KERNEL);
+	instance = kmalloc(instance_size, GFP_KERNEL);
 	if (!instance) {
 		dev_dbg(dev, "%s: no memory for instance data!\n", __func__);
 		return -ENOMEM;
 	}
 
-	memset(instance, 0, sizeof(*instance));
+	memset(instance, 0, instance_size);
 
 	/* public fields */
 
@@ -1051,6 +1051,8 @@
 			goto fail_unbind;
 		}
 
+		instance->urbs[i] = urb;
+
 		buffer = kmalloc(channel->buf_size, GFP_KERNEL);
 		if (!buffer) {
 			dev_dbg(dev, "%s: no memory for buffer %d!\n", __func__, i);
@@ -1078,7 +1080,6 @@
 
 		vdbg("%s: alloced buffer 0x%p buf size %u urb 0x%p",
 		     __func__, urb->transfer_buffer, urb->transfer_buffer_length, urb);
-		instance->urbs[i] = urb;
 	}
 
 	if (need_heavy && driver->heavy_init) {





More information about the Usbatm mailing list