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-next,2/2] net: cdc_eem: clean up bind error path From: Oliver Neukum Message-Id: <1520418651.5229.4.camel@suse.com> Date: Wed, 07 Mar 2018 11:30:51 +0100 To: Johan Hovold , "David S. Miller" Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org List-ID: QW0gTWl0dHdvY2gsIGRlbiAwNy4wMy4yMDE4LCAxMDo0NiArMDEwMCBzY2hyaWViIEpvaGFuIEhv dm9sZDoKPiBEcm9wIGJvZ3VzIGNhbGwgdG8gdXNiX2RyaXZlcl9yZWxlYXNlX2ludGVyZmFjZSgp IGZyb20gYW4gZXJyb3IgcGF0aCBpbgo+IHRoZSB1c2JuZXQgYmluZCgpIGNhbGxiYWNrLCB3aGlj aCBpcyBjYWxsZWQgZHVyaW5nIGludGVyZmFjZSBwcm9iZS4gQXQKPiB0aGlzIHBvaW50IHRoZSBp bnRlcmZhY2UgaXMgbm90IGJvdW5kIGFuZCB1c2JfZHJpdmVyX3JlbGVhc2VfaW50ZXJmYWNlKCkK PiByZXR1cm5zIGVhcmx5Lgo+IAo+IEFsc28gcmVtb3ZlIHRoZSBib2d1cyBjYWxsIHRvIGNsZWFy IHRoZSBpbnRlcmZhY2UgZGF0YSwgd2hpY2ggaXMgb3duZWQKPiBieSB0aGUgdXNibmV0IGRyaXZl ciBhbmQgd291bGQgbm90IGV2ZW4gaGF2ZSBiZWVuIHNldCBieSB0aGUgdGltZSBiaW5kKCkKPiBp cyBjYWxsZWQuCj4gCj4gU2lnbmVkLW9mZi1ieTogSm9oYW4gSG92b2xkIDxqb2hhbkBrZXJuZWwu b3JnPgpBY2tlZC1ieTogT2xpdmVyIE5ldWt1bSA8b25ldWt1bUBzdXNlLmNvbT4KPiAtLS0KPiAg ZHJpdmVycy9uZXQvdXNiL2NkY19lZW0uYyB8IDUgKy0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDEg aW5zZXJ0aW9uKCspLCA0IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL25l dC91c2IvY2RjX2VlbS5jIGIvZHJpdmVycy9uZXQvdXNiL2NkY19lZW0uYwo+IGluZGV4IGY3MTgw ZjhkYjM5ZS4uNjFlYTRlYWFjZTVkIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvbmV0L3VzYi9jZGNf ZWVtLmMKPiArKysgYi9kcml2ZXJzL25ldC91c2IvY2RjX2VlbS5jCj4gQEAgLTgzLDExICs4Myw4 IEBAIHN0YXRpYyBpbnQgZWVtX2JpbmQoc3RydWN0IHVzYm5ldCAqZGV2LCBzdHJ1Y3QgdXNiX2lu dGVyZmFjZSAqaW50ZikKPiAgCWludCBzdGF0dXMgPSAwOwo+ICAKPiAgCXN0YXR1cyA9IHVzYm5l dF9nZXRfZW5kcG9pbnRzKGRldiwgaW50Zik7Cj4gLQlpZiAoc3RhdHVzIDwgMCkgewo+IC0JCXVz Yl9zZXRfaW50ZmRhdGEoaW50ZiwgTlVMTCk7Cj4gLQkJdXNiX2RyaXZlcl9yZWxlYXNlX2ludGVy ZmFjZShkcml2ZXJfb2YoaW50ZiksIGludGYpOwo+ICsJaWYgKHN0YXR1cyA8IDApCj4gIAkJcmV0 dXJuIHN0YXR1czsKPiAtCX0KPiAgCj4gIAkvKiBubyBqdW1ib2dyYW0gKDE2Sykgc3VwcG9ydCBm b3Igbm93ICovCj4KLS0tClRvIHVuc3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0OiBzZW5kIHRoZSBs aW5lICJ1bnN1YnNjcmliZSBsaW51eC11c2IiIGluCnRoZSBib2R5IG9mIGEgbWVzc2FnZSB0byBt YWpvcmRvbW9Admdlci5rZXJuZWwub3JnCk1vcmUgbWFqb3Jkb21vIGluZm8gYXQgIGh0dHA6Ly92 Z2VyLmtlcm5lbC5vcmcvbWFqb3Jkb21vLWluZm8uaHRtbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de ([195.135.220.15]:42402 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751112AbeCGKgg (ORCPT ); Wed, 7 Mar 2018 05:36:36 -0500 Message-ID: <1520418651.5229.4.camel@suse.com> Subject: Re: [PATCH net-next 2/2] net: cdc_eem: clean up bind error path From: Oliver Neukum To: Johan Hovold , "David S. Miller" Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org Date: Wed, 07 Mar 2018 11:30:51 +0100 In-Reply-To: <20180307094658.9008-2-johan@kernel.org> References: <20180307094658.9008-1-johan@kernel.org> <20180307094658.9008-2-johan@kernel.org> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org List-ID: Am Mittwoch, den 07.03.2018, 10:46 +0100 schrieb Johan Hovold: > Drop bogus call to usb_driver_release_interface() from an error path in > the usbnet bind() callback, which is called during interface probe. At > this point the interface is not bound and usb_driver_release_interface() > returns early. > > Also remove the bogus call to clear the interface data, which is owned > by the usbnet driver and would not even have been set by the time bind() > is called. > > Signed-off-by: Johan Hovold Acked-by: Oliver Neukum > --- > drivers/net/usb/cdc_eem.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c > index f7180f8db39e..61ea4eaace5d 100644 > --- a/drivers/net/usb/cdc_eem.c > +++ b/drivers/net/usb/cdc_eem.c > @@ -83,11 +83,8 @@ static int eem_bind(struct usbnet *dev, struct usb_interface *intf) > int status = 0; > > status = usbnet_get_endpoints(dev, intf); > - if (status < 0) { > - usb_set_intfdata(intf, NULL); > - usb_driver_release_interface(driver_of(intf), intf); > + if (status < 0) > return status; > - } > > /* no jumbogram (16K) support for now */ >