[patch 23/29] USB: ldusb fixes

Greg KH
2005-07-30T02:10:48Z

[-- Attachment #1: usb-ldusb-fixes.patch --]
[-- Type: text/plain, Size: 1379 bytes --]

From: Michael Hund <mhund@ld-didactic.de>

below you will find the forgotten kmalloc check (sorry).

Signed-off-by: Michael Hund <mhund@ld-didactic.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
drivers/usb/misc/ldusb.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletion(-)

--- gregkh-2.6.orig/drivers/usb/misc/ldusb.c 2005-07-29 11:29:48.000000000 -0700
+++ gregkh-2.6/drivers/usb/misc/ldusb.c 2005-07-29 11:36:30.000000000 -0700
@@ -23,6 +23,7 @@
*
* V0.1 (mh) Initial version
* V0.11 (mh) Added raw support for HID 1.0 devices (no interrupt out endpoint)
+ * V0.12 (mh) Added kmalloc check for string buffer
*/

#include <linux/config.h>
@@ -84,7 +85,7 @@
{ } /* Terminating entry */
};
MODULE_DEVICE_TABLE(usb, ld_usb_table);
-MODULE_VERSION("V0.11");
+MODULE_VERSION("V0.12");
MODULE_AUTHOR("Michael Hund <mhund@ld-didactic.de>");
MODULE_DESCRIPTION("LD USB Driver");
MODULE_LICENSE("GPL");
@@ -635,6 +636,10 @@
(le16_to_cpu(udev->descriptor.idProduct) == USB_DEVICE_ID_COM3LAB)) &&
(le16_to_cpu(udev->descriptor.bcdDevice) <= 0x103)) {
buffer = kmalloc(256, GFP_KERNEL);
+ if (buffer == NULL) {
+ dev_err(&intf->dev, "Couldn't allocate string buffer\n");
+ goto error;
+ }
/* usb_string makes SETUP+STALL to leave always ControlReadLoop */
usb_string(udev, 255, buffer, 256);
kfree(buffer);

--