Commit 5697db4a authored May 02, 2018 by Bjørn Mork Committed by David S. Miller May 03, 2018

qmi_wwan: do not steal interfaces from class drivers



The USB_DEVICE_INTERFACE_NUMBER matching macro assumes that
the { vendorid, productid, interfacenumber } set uniquely
identifies one specific function.  This has proven to fail
for some configurable devices. One example is the Quectel
EM06/EP06 where the same interface number can be either
QMI or MBIM, without the device ID changing either.

Fix by requiring the vendor-specific class for interface number
based matching.  Functions of other classes can and should use
class based matching instead.

Fixes: 03304bcb ("net: qmi_wwan: use fixed interface number matching")
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 94720e3a

drivers/net/usb/qmi_wwan.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -1344,6 +1344,18 @@ static int qmi_wwan_probe(struct usb_interface *intf,
		id->driver_info = (unsigned long)&qmi_wwan_info;
		}

		/* There are devices where the same interface number can be
		* configured as different functions. We should only bind to
		* vendor specific functions when matching on interface number
		*/
		if (id->match_flags & USB_DEVICE_ID_MATCH_INT_NUMBER &&
		desc->bInterfaceClass != USB_CLASS_VENDOR_SPEC) {
		dev_dbg(&intf->dev,
		"Rejecting interface number match for class %02x\n",
		desc->bInterfaceClass);
		return -ENODEV;
		}

		/* Quectel EC20 quirk where we've QMI on interface 4 instead of 0 */
		if (quectel_ec20_detected(intf) && desc->bInterfaceNumber == 0) {
		dev_dbg(&intf->dev, "Quectel EC20 quirk, skipping interface 0\n");

Admin message