From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [PATCH net,stable] qmi_wwan: do not steal interfaces from class drivers Date: Thu, 03 May 2018 11:25:49 -0400 (EDT) Message-ID: <20180503.112549.2254608944377901012.davem@davemloft.net> References: <20180502202254.3021-1-bjorn@mork.no> Mime-Version: 1.0 Content-Type: Text/Plain; charset=iso-8859-1 Content-Transfer-Encoding: 8BIT Cc: netdev@vger.kernel.org, linux-usb@vger.kernel.org To: bjorn@mork.no Return-path: Received: from shards.monkeyblade.net ([184.105.139.130]:48340 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751050AbeECPZu (ORCPT ); Thu, 3 May 2018 11:25:50 -0400 In-Reply-To: <20180502202254.3021-1-bjorn@mork.no> Sender: netdev-owner@vger.kernel.org List-ID: From: Bjørn Mork Date: Wed, 2 May 2018 22:22:54 +0200 > 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: 03304bcb5ec4 ("net: qmi_wwan: use fixed interface number matching") > Signed-off-by: Bjørn Mork > --- > It's quite possible that the fix should be integrated in the > USB_DEVICE_INTERFACE_NUMBER macro instead. But that has grown a few > other users since it was added, so changing it now seems risky. > Another option is of course adding a new match macro with the > USB_CLASS_VENDOR_SPEC match integrated. Maybe best? > > But I'm proposing this as-is for now, since this quickfix seems most > suitable for stable backporting. Yes, this simpler approache is better for net and -stable. Applied. If you want to do something more sophisticated, that can be done in net-next. Thanks. From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [net,stable] qmi_wwan: do not steal interfaces from class drivers From: David Miller Message-Id: <20180503.112549.2254608944377901012.davem@davemloft.net> Date: Thu, 03 May 2018 11:25:49 -0400 (EDT) To: bjorn@mork.no Cc: netdev@vger.kernel.org, linux-usb@vger.kernel.org List-ID: RnJvbTogQmrDuHJuIE1vcmsgPGJqb3JuQG1vcmsubm8+CkRhdGU6IFdlZCwgIDIgTWF5IDIwMTgg MjI6MjI6NTQgKzAyMDAKCj4gVGhlIFVTQl9ERVZJQ0VfSU5URVJGQUNFX05VTUJFUiBtYXRjaGlu ZyBtYWNybyBhc3N1bWVzIHRoYXQKPiB0aGUgeyB2ZW5kb3JpZCwgcHJvZHVjdGlkLCBpbnRlcmZh Y2VudW1iZXIgfSBzZXQgdW5pcXVlbHkKPiBpZGVudGlmaWVzIG9uZSBzcGVjaWZpYyBmdW5jdGlv bi4gIFRoaXMgaGFzIHByb3ZlbiB0byBmYWlsCj4gZm9yIHNvbWUgY29uZmlndXJhYmxlIGRldmlj ZXMuIE9uZSBleGFtcGxlIGlzIHRoZSBRdWVjdGVsCj4gRU0wNi9FUDA2IHdoZXJlIHRoZSBzYW1l IGludGVyZmFjZSBudW1iZXIgY2FuIGJlIGVpdGhlcgo+IFFNSSBvciBNQklNLCB3aXRob3V0IHRo ZSBkZXZpY2UgSUQgY2hhbmdpbmcgZWl0aGVyLgo+IAo+IEZpeCBieSByZXF1aXJpbmcgdGhlIHZl bmRvci1zcGVjaWZpYyBjbGFzcyBmb3IgaW50ZXJmYWNlIG51bWJlcgo+IGJhc2VkIG1hdGNoaW5n LiAgRnVuY3Rpb25zIG9mIG90aGVyIGNsYXNzZXMgY2FuIGFuZCBzaG91bGQgdXNlCj4gY2xhc3Mg YmFzZWQgbWF0Y2hpbmcgaW5zdGVhZC4KPiAKPiBGaXhlczogMDMzMDRiY2I1ZWM0ICgibmV0OiBx bWlfd3dhbjogdXNlIGZpeGVkIGludGVyZmFjZSBudW1iZXIgbWF0Y2hpbmciKQo+IFNpZ25lZC1v ZmYtYnk6IEJqw7hybiBNb3JrIDxiam9ybkBtb3JrLm5vPgo+IC0tLQo+IEl0J3MgcXVpdGUgcG9z c2libGUgdGhhdCB0aGUgZml4IHNob3VsZCBiZSBpbnRlZ3JhdGVkIGluIHRoZQo+IFVTQl9ERVZJ Q0VfSU5URVJGQUNFX05VTUJFUiBtYWNybyBpbnN0ZWFkLiAgQnV0IHRoYXQgaGFzIGdyb3duIGEg ZmV3Cj4gb3RoZXIgdXNlcnMgc2luY2UgaXQgd2FzIGFkZGVkLCBzbyBjaGFuZ2luZyBpdCBub3cg c2VlbXMgcmlza3kuIAo+IEFub3RoZXIgb3B0aW9uIGlzIG9mIGNvdXJzZSBhZGRpbmcgYSBuZXcg bWF0Y2ggbWFjcm8gd2l0aCB0aGUKPiBVU0JfQ0xBU1NfVkVORE9SX1NQRUMgbWF0Y2ggaW50ZWdy YXRlZC4gTWF5YmUgYmVzdD8KPiAKPiBCdXQgSSdtIHByb3Bvc2luZyB0aGlzIGFzLWlzIGZvciBu b3csIHNpbmNlIHRoaXMgcXVpY2tmaXggc2VlbXMgbW9zdAo+IHN1aXRhYmxlIGZvciBzdGFibGUg YmFja3BvcnRpbmcuCgpZZXMsIHRoaXMgc2ltcGxlciBhcHByb2FjaGUgaXMgYmV0dGVyIGZvciBu ZXQgYW5kIC1zdGFibGUuCgpBcHBsaWVkLgoKSWYgeW91IHdhbnQgdG8gZG8gc29tZXRoaW5nIG1v cmUgc29waGlzdGljYXRlZCwgdGhhdCBjYW4gYmUgZG9uZQppbiBuZXQtbmV4dC4KClRoYW5rcy4K LS0tClRvIHVuc3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNj cmliZSBsaW51eC11c2IiIGluCnRoZSBib2R5IG9mIGEgbWVzc2FnZSB0byBtYWpvcmRvbW9Admdl ci5rZXJuZWwub3JnCk1vcmUgbWFqb3Jkb21vIGluZm8gYXQgIGh0dHA6Ly92Z2VyLmtlcm5lbC5v cmcvbWFqb3Jkb21vLWluZm8uaHRtbAo=