diff mbox

cdc-acm: fix NULL pointer reference

Message ID 1452160860-2752-1-git-send-email-oneukum@suse.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Oliver Neukum Jan. 7, 2016, 10:01 a.m. UTC 
The union descriptor must be checked. Its usage was conditional
before the parser was introduced. This is important, because
many RNDIS device, which also use the common parser, have
bogus extra descriptors.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Tested-by: Vasily Galkin <galkin-vv@yandex.ru>
---
 drivers/net/usb/cdc_ether.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

David Miller Jan. 10, 2016, 2:01 a.m. UTC | #1 
From: Oliver Neukum <oneukum@suse.com>
Date: Thu,  7 Jan 2016 11:01:00 +0100

> The union descriptor must be checked. Its usage was conditional
> before the parser was introduced. This is important, because
> many RNDIS device, which also use the common parser, have
> bogus extra descriptors.
> 
> Signed-off-by: Oliver Neukum <oneukum@suse.com>
> Tested-by: Vasily Galkin <galkin-vv@yandex.ru>

Applied, thanks Oliver.
diff mbox

Patch

diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 3da70bf..7cba2c3 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -160,6 +160,12 @@  int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf)
 	info->u = header.usb_cdc_union_desc;
 	info->header = header.usb_cdc_header_desc;
 	info->ether = header.usb_cdc_ether_desc;
+	if (!info->u) {
+		if (rndis)
+			goto skip;
+		else /* in that case a quirk is mandatory */
+			goto bad_desc;
+	}
 	/* we need a master/control interface (what we're
 	 * probed with) and a slave/data interface; union
 	 * descriptors sort this all out.
@@ -256,7 +262,7 @@  skip:
 			goto bad_desc;
 		}
 
-	} else if (!info->header || !info->u || (!rndis && !info->ether)) {
+	} else if (!info->header || (!rndis && !info->ether)) {
 		dev_dbg(&intf->dev, "missing cdc %s%s%sdescriptor\n",
 			info->header ? "" : "header ",
 			info->u ? "" : "union ",