]> err.no Git - linux-2.6/commitdiff
USB: don't try to kzalloc 0 bytes
authorAlan Stern <stern@rowland.harvard.edu>
Tue, 15 May 2007 21:40:37 +0000 (17:40 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 23 May 2007 06:45:50 +0000 (23:45 -0700)
This patch (as907) prevents us from trying to allocate 0 bytes
when an interface has no endpoint descriptors.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/core/config.c

index bfb3731d42db816531a4cacd69d692ff04727827..2d4fd530e5e448d42fa7f2b40641ccbe39bdd934 100644 (file)
@@ -185,10 +185,12 @@ static int usb_parse_interface(struct device *ddev, int cfgno,
                num_ep = USB_MAXENDPOINTS;
        }
 
-       len = sizeof(struct usb_host_endpoint) * num_ep;
-       alt->endpoint = kzalloc(len, GFP_KERNEL);
-       if (!alt->endpoint)
-               return -ENOMEM;
+       if (num_ep > 0) {       /* Can't allocate 0 bytes */
+               len = sizeof(struct usb_host_endpoint) * num_ep;
+               alt->endpoint = kzalloc(len, GFP_KERNEL);
+               if (!alt->endpoint)
+                       return -ENOMEM;
+       }
 
        /* Parse all the endpoint descriptors */
        n = 0;