patch-2.3.27 linux/drivers/usb/usb.c

• Lines: 28
• Date: Tue Nov 9 08:24:32 1999
• Orig file: v2.3.26/linux/drivers/usb/usb.c
• Orig date: Sun Nov 7 16:37:34 1999

diff -u --recursive --new-file v2.3.26/linux/drivers/usb/usb.c linux/drivers/usb/usb.c
@@ -720,7 +720,7 @@
 	}
 
 	memset(config->interface, 0,
-	       config->bNumInterfaces*sizeof(struct usb_interface_descriptor));
+	       config->bNumInterfaces * sizeof(struct usb_interface));
 
 	buffer += config->bLength;
 	size -= config->bLength;
@@ -1140,13 +1140,16 @@
 	}
 
 	if (usb_get_string(dev, dev->string_langid, index, u.buffer, 4) < 0 ||
-	    usb_get_string(dev, dev->string_langid, index, u.buffer,
-			      u.desc.bLength) < 0) {
+	    ((ret = usb_get_string(dev, dev->string_langid, index, u.buffer,
+			      u.desc.bLength)) < 0)) {
 		printk(KERN_ERR "usb: error retrieving string\n");
 		return NULL;
 	}
 
+	if (ret > 0) ret /= 2;		/* going from 16-bit chars to 8-bit */
 	len = u.desc.bLength / 2;	/* includes terminating null */
+					/* after removing bLength & bDescType */
+	if (ret < len) len = ret;	/* use min of (ret, len) */
 
 	ptr = kmalloc(len, GFP_KERNEL);
 	if (!ptr) {