]> git.itanic.dy.fi Git - linux-stable/commitdiff
USB: fix oops in cdc-wdm in case of malformed descriptors
authorOliver Neukum <oliver@neukum.org>
Fri, 17 Apr 2009 21:20:06 +0000 (21:20 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 2 May 2009 17:24:29 +0000 (10:24 -0700)
upstream commit: e13c594f3a1fc2c78e7a20d1a07974f71e4b448f

cdc-wdm needs to ignore extremely malformed descriptors.

Signed-off-by: Oliver Neukum <oliver@neukum.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
drivers/usb/class/cdc-wdm.c

index 023a4e988f399f6593ccc331c1172335b93493a1..abbdb31e3591d057497ea93ffdf2cbd7df23069d 100644 (file)
@@ -641,7 +641,7 @@ static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
        iface = &intf->altsetting[0];
        ep = &iface->endpoint[0].desc;
-       if (!usb_endpoint_is_int_in(ep)) {
+       if (!ep || !usb_endpoint_is_int_in(ep)) {
                rv = -EINVAL;
                goto err;
        }