From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB5DFC433E0 for ; Thu, 2 Jul 2020 02:53:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 78C66207F5 for ; Thu, 2 Jul 2020 02:53:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="aLSG1kWm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726504AbgGBCxZ (ORCPT ); Wed, 1 Jul 2020 22:53:25 -0400 Received: from mailgw02.mediatek.com ([1.203.163.81]:40039 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726146AbgGBCxZ (ORCPT ); Wed, 1 Jul 2020 22:53:25 -0400 X-UUID: dee14df25634404982d404beca267926-20200702 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=afpaC7qRGVZ6JRFynQgro+7OJFSDdHfSPLeLJ/lq7kQ=; b=aLSG1kWmHRehrrGQ3rqzjfigMarWaiFUhQ7v78o07HneYshjxm0TtsjxlfDJ93oVg48TrHNcYz/mTSwKXH2FX3xrwX0W8pO9A89pAl6spVO2XB7nXm8UocNMJ6AfRRU1t1SHBFdrmGxJHPd54OoLXPkaB+PsXp4NdKb2UAlrIFQ=; X-UUID: dee14df25634404982d404beca267926-20200702 Received: from mtkcas34.mediatek.inc [(172.27.4.253)] by mailgw02.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLS) with ESMTP id 290555990; Thu, 02 Jul 2020 10:53:16 +0800 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS32N1.mediatek.inc (172.27.4.71) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 2 Jul 2020 10:53:14 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 2 Jul 2020 10:53:09 +0800 Message-ID: <1593658371.23885.16.camel@mhfsdcap03> Subject: Re: [V2 PATCH] usb: mtu3: fix NULL pointer dereference From: Chunfeng Yun To: Greg Kroah-Hartman CC: Felipe Balbi , Matthias Brugger , Markus Elfring , , , , Date: Thu, 2 Jul 2020 10:52:51 +0800 In-Reply-To: <20200701115821.GA2184169@kroah.com> References: <1593502942-24455-1-git-send-email-chunfeng.yun@mediatek.com> <20200701115821.GA2184169@kroah.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: 9F8CFEA6CEBAFB7D9D5D9DF806B368CC530AA52FD6E6FE9C3269E92BF6BF031F2000:8 X-MTK: N Content-Transfer-Encoding: base64 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org T24gV2VkLCAyMDIwLTA3LTAxIGF0IDEzOjU4ICswMjAwLCBHcmVnIEtyb2FoLUhhcnRtYW4gd3Jv dGU6DQo+IE9uIFR1ZSwgSnVuIDMwLCAyMDIwIGF0IDAzOjQyOjIyUE0gKzA4MDAsIENodW5mZW5n IFl1biB3cm90ZToNCj4gPiBTb21lIHBvaW50ZXJzIGFyZSBkZXJlZmVyZW5jZWQgYmVmb3JlIHN1 Y2Nlc3NmdWwgY2hlY2tzLg0KPiA+IA0KPiA+IFJlcG9ydGVkLWJ5OiBNYXJrdXMgRWxmcmluZyA8 TWFya3VzLkVsZnJpbmdAd2ViLmRlPg0KPiA+IFNpZ25lZC1vZmYtYnk6IENodW5mZW5nIFl1biA8 Y2h1bmZlbmcueXVuQG1lZGlhdGVrLmNvbT4NCj4gPiAtLS0NCj4gPiB2Mjogbm90aGluZyBjaGFu Z2VkLCBidXQgYWJhbmRvbiBhbm90aGVyIHBhdGNoDQo+ID4gLS0tDQo+ID4gIGRyaXZlcnMvdXNi L210dTMvbXR1M19nYWRnZXQuYyB8IDI1ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0NCj4gPiAg MSBmaWxlIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pDQo+ID4gDQo+ ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL210dTMvbXR1M19nYWRnZXQuYyBiL2RyaXZlcnMv dXNiL210dTMvbXR1M19nYWRnZXQuYw0KPiA+IGluZGV4IGY5MzczMmUuLjE2ODljYTggMTAwNjQ0 DQo+ID4gLS0tIGEvZHJpdmVycy91c2IvbXR1My9tdHUzX2dhZGdldC5jDQo+ID4gKysrIGIvZHJp dmVycy91c2IvbXR1My9tdHUzX2dhZGdldC5jDQo+ID4gQEAgLTMzMiwxNCArMzMyLDIxIEBAIHN0 YXRpYyBpbnQgbXR1M19nYWRnZXRfcXVldWUoc3RydWN0IHVzYl9lcCAqZXAsDQo+ID4gIA0KPiA+ ICBzdGF0aWMgaW50IG10dTNfZ2FkZ2V0X2RlcXVldWUoc3RydWN0IHVzYl9lcCAqZXAsIHN0cnVj dCB1c2JfcmVxdWVzdCAqcmVxKQ0KPiA+ICB7DQo+ID4gLQlzdHJ1Y3QgbXR1M19lcCAqbWVwID0g dG9fbXR1M19lcChlcCk7DQo+ID4gLQlzdHJ1Y3QgbXR1M19yZXF1ZXN0ICptcmVxID0gdG9fbXR1 M19yZXF1ZXN0KHJlcSk7DQo+ID4gKwlzdHJ1Y3QgbXR1M19lcCAqbWVwOw0KPiA+ICsJc3RydWN0 IG10dTNfcmVxdWVzdCAqbXJlcTsNCj4gPiAgCXN0cnVjdCBtdHUzX3JlcXVlc3QgKnI7DQo+ID4g KwlzdHJ1Y3QgbXR1MyAqbXR1Ow0KPiA+ICAJdW5zaWduZWQgbG9uZyBmbGFnczsNCj4gPiAgCWlu dCByZXQgPSAwOw0KPiA+IC0Jc3RydWN0IG10dTMgKm10dSA9IG1lcC0+bXR1Ow0KPiA+ICANCj4g PiAtCWlmICghZXAgfHwgIXJlcSB8fCBtcmVxLT5tZXAgIT0gbWVwKQ0KPiA+ICsJaWYgKCFlcCB8 fCAhcmVxKQ0KPiA+ICsJCXJldHVybiAtRUlOVkFMOw0KPiANCj4gSG93IHdpbGwgZWl0aGVyIG9m IHRob3NlIGV2ZXIgYmUgTlVMTD8gIFRoZSBrZXJuZWwgd2lsbCBub3QgY2FsbCB0aGlzDQo+IGZ1 bmN0aW9uIHdpdGggZWl0aGVyIG9mIHRoZW0gYmVpbmcgTlVMTCwgcmlnaHQ/DQpZZXMsIEkgZmlu ZCBhbGwgY2xhc3MgZHJpdmVycyBhbHJlYWR5IGVuc3VyZSB0aGV5IGFyZSBub3QgTlVMTC4NCg0K PiANCj4gPiArDQo+ID4gKwltZXAgPSB0b19tdHUzX2VwKGVwKTsNCj4gPiArCW10dSA9IG1lcC0+ bXR1Ow0KPiA+ICsNCj4gPiArCW1yZXEgPSB0b19tdHUzX3JlcXVlc3QocmVxKTsNCj4gPiArCWlm IChtcmVxLT5tZXAgIT0gbWVwKQ0KPiA+ICAJCXJldHVybiAtRUlOVkFMOw0KPiA+ICANCj4gPiAg CWRldl9kYmcobXR1LT5kZXYsICIlcyA6IHJlcT0lcFxuIiwgX19mdW5jX18sIHJlcSk7DQo+ID4g QEAgLTM3Myw4ICszODAsOCBAQCBzdGF0aWMgaW50IG10dTNfZ2FkZ2V0X2RlcXVldWUoc3RydWN0 IHVzYl9lcCAqZXAsIHN0cnVjdCB1c2JfcmVxdWVzdCAqcmVxKQ0KPiA+ICAgKi8NCj4gPiAgc3Rh dGljIGludCBtdHUzX2dhZGdldF9lcF9zZXRfaGFsdChzdHJ1Y3QgdXNiX2VwICplcCwgaW50IHZh bHVlKQ0KPiA+ICB7DQo+ID4gLQlzdHJ1Y3QgbXR1M19lcCAqbWVwID0gdG9fbXR1M19lcChlcCk7 DQo+ID4gLQlzdHJ1Y3QgbXR1MyAqbXR1ID0gbWVwLT5tdHU7DQo+ID4gKwlzdHJ1Y3QgbXR1M19l cCAqbWVwOw0KPiA+ICsJc3RydWN0IG10dTMgKm10dTsNCj4gPiAgCXN0cnVjdCBtdHUzX3JlcXVl c3QgKm1yZXE7DQo+ID4gIAl1bnNpZ25lZCBsb25nIGZsYWdzOw0KPiA+ICAJaW50IHJldCA9IDA7 DQo+ID4gQEAgLTM4Miw2ICszODksOSBAQCBzdGF0aWMgaW50IG10dTNfZ2FkZ2V0X2VwX3NldF9o YWx0KHN0cnVjdCB1c2JfZXAgKmVwLCBpbnQgdmFsdWUpDQo+ID4gIAlpZiAoIWVwKQ0KPiA+ICAJ CXJldHVybiAtRUlOVkFMOw0KPiANCj4gU2FtZSBoZXJlLCBob3cgY2FuIHRoYXQgZXZlciBoYXBw ZW4/DQpNYXliZSB3aGVuIHRoZSBjbGFzcyBkcml2ZXIgaGFzIHNvbWV0aGluZyB3cm9uZzopDQoN CllvdSBtZWFuIGl0J3MgYmV0dGVyIHRvIHJlbW92ZSB0aGVzZSB1bm5lY2Vzc2FyeSBjaGVja3M/ DQoNClRoYW5rcw0KDQo+IA0KPiA+ICANCj4gPiArCW1lcCA9IHRvX210dTNfZXAoZXApOw0KPiA+ ICsJbXR1ID0gbWVwLT5tdHU7DQo+ID4gKw0KPiA+ICAJZGV2X2RiZyhtdHUtPmRldiwgIiVzIDog JXMuLi4iLCBfX2Z1bmNfXywgZXAtPm5hbWUpOw0KPiA+ICANCj4gPiAgCXNwaW5fbG9ja19pcnFz YXZlKCZtdHUtPmxvY2ssIGZsYWdzKTsNCj4gPiBAQCAtNDIyLDExICs0MzIsMTIgQEAgc3RhdGlj IGludCBtdHUzX2dhZGdldF9lcF9zZXRfaGFsdChzdHJ1Y3QgdXNiX2VwICplcCwgaW50IHZhbHVl KQ0KPiA+ICAvKiBTZXRzIHRoZSBoYWx0IGZlYXR1cmUgd2l0aCB0aGUgY2xlYXIgcmVxdWVzdHMg aWdub3JlZCAqLw0KPiA+ICBzdGF0aWMgaW50IG10dTNfZ2FkZ2V0X2VwX3NldF93ZWRnZShzdHJ1 Y3QgdXNiX2VwICplcCkNCj4gPiAgew0KPiA+IC0Jc3RydWN0IG10dTNfZXAgKm1lcCA9IHRvX210 dTNfZXAoZXApOw0KPiA+ICsJc3RydWN0IG10dTNfZXAgKm1lcDsNCj4gPiAgDQo+ID4gIAlpZiAo IWVwKQ0KPiA+ICAJCXJldHVybiAtRUlOVkFMOw0KPiANCj4gQWdhaW4sIHNhbWUgaGVyZS4NCj4g DQo+IHRoYW5rcywNCj4gDQo+IGdyZWcgay1oDQoNCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 205A5C433DF for ; Thu, 2 Jul 2020 02:53:43 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E0536207F5 for ; Thu, 2 Jul 2020 02:53:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="hfY5iICi"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="aLSG1kWm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E0536207F5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Date:To:From: Subject:Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=cfE3Ne8bBIegSjFa/zh4elFKReLtgPI/iSMGOV9veUM=; b=hfY5iICi1sX9JKcGuBxWbBPv+ kWqdMUI0gFsuB+f2e3/cLu5Jmjdpn2GVmDbSFAFk5aUdRKzYW9uBxwbwZWsB8zdlFRPGkfQrfFd2Q WyrfDOU01MdNxpkZ6uWtWDO/jKA4PyvE6pFK1m1GFqrFP9f+FCK4M7lFAI/rOU0Pxe85cM4pdDo8Z KsIJbQHSIlsLkaAIzN6LkP2zx1cYGBjdBBaArUaWKlTHcemzpW858TaErCybd21H4FRqTBXAlI/9U 7biAXQx3QggxFSQoqd+kF39yc4YxJ8B5xEnNAe7C2F1TfCW6LrlCJ3XLbn1CQGABpyrEUuJno/6Iz RGu8JEDhw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqpLv-0001NF-Ac; Thu, 02 Jul 2020 02:53:31 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqpLr-0001MC-LL; Thu, 02 Jul 2020 02:53:28 +0000 X-UUID: d38d504bc70a4920867738f294b337d1-20200701 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=afpaC7qRGVZ6JRFynQgro+7OJFSDdHfSPLeLJ/lq7kQ=; b=aLSG1kWmHRehrrGQ3rqzjfigMarWaiFUhQ7v78o07HneYshjxm0TtsjxlfDJ93oVg48TrHNcYz/mTSwKXH2FX3xrwX0W8pO9A89pAl6spVO2XB7nXm8UocNMJ6AfRRU1t1SHBFdrmGxJHPd54OoLXPkaB+PsXp4NdKb2UAlrIFQ=; X-UUID: d38d504bc70a4920867738f294b337d1-20200701 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1247762619; Wed, 01 Jul 2020 18:53:19 -0800 Received: from MTKMBS32N1.mediatek.inc (172.27.4.71) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 1 Jul 2020 19:53:17 -0700 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS32N1.mediatek.inc (172.27.4.71) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 2 Jul 2020 10:53:14 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 2 Jul 2020 10:53:09 +0800 Message-ID: <1593658371.23885.16.camel@mhfsdcap03> Subject: Re: [V2 PATCH] usb: mtu3: fix NULL pointer dereference From: Chunfeng Yun To: Greg Kroah-Hartman Date: Thu, 2 Jul 2020 10:52:51 +0800 In-Reply-To: <20200701115821.GA2184169@kroah.com> References: <1593502942-24455-1-git-send-email-chunfeng.yun@mediatek.com> <20200701115821.GA2184169@kroah.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: 9F8CFEA6CEBAFB7D9D5D9DF806B368CC530AA52FD6E6FE9C3269E92BF6BF031F2000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200701_225327_827536_43EF5226 X-CRM114-Status: GOOD ( 21.50 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Felipe Balbi , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Matthias Brugger , Markus Elfring , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Wed, 2020-07-01 at 13:58 +0200, Greg Kroah-Hartman wrote: > On Tue, Jun 30, 2020 at 03:42:22PM +0800, Chunfeng Yun wrote: > > Some pointers are dereferenced before successful checks. > > > > Reported-by: Markus Elfring > > Signed-off-by: Chunfeng Yun > > --- > > v2: nothing changed, but abandon another patch > > --- > > drivers/usb/mtu3/mtu3_gadget.c | 25 ++++++++++++++++++------- > > 1 file changed, 18 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/usb/mtu3/mtu3_gadget.c b/drivers/usb/mtu3/mtu3_gadget.c > > index f93732e..1689ca8 100644 > > --- a/drivers/usb/mtu3/mtu3_gadget.c > > +++ b/drivers/usb/mtu3/mtu3_gadget.c > > @@ -332,14 +332,21 @@ static int mtu3_gadget_queue(struct usb_ep *ep, > > > > static int mtu3_gadget_dequeue(struct usb_ep *ep, struct usb_request *req) > > { > > - struct mtu3_ep *mep = to_mtu3_ep(ep); > > - struct mtu3_request *mreq = to_mtu3_request(req); > > + struct mtu3_ep *mep; > > + struct mtu3_request *mreq; > > struct mtu3_request *r; > > + struct mtu3 *mtu; > > unsigned long flags; > > int ret = 0; > > - struct mtu3 *mtu = mep->mtu; > > > > - if (!ep || !req || mreq->mep != mep) > > + if (!ep || !req) > > + return -EINVAL; > > How will either of those ever be NULL? The kernel will not call this > function with either of them being NULL, right? Yes, I find all class drivers already ensure they are not NULL. > > > + > > + mep = to_mtu3_ep(ep); > > + mtu = mep->mtu; > > + > > + mreq = to_mtu3_request(req); > > + if (mreq->mep != mep) > > return -EINVAL; > > > > dev_dbg(mtu->dev, "%s : req=%p\n", __func__, req); > > @@ -373,8 +380,8 @@ static int mtu3_gadget_dequeue(struct usb_ep *ep, struct usb_request *req) > > */ > > static int mtu3_gadget_ep_set_halt(struct usb_ep *ep, int value) > > { > > - struct mtu3_ep *mep = to_mtu3_ep(ep); > > - struct mtu3 *mtu = mep->mtu; > > + struct mtu3_ep *mep; > > + struct mtu3 *mtu; > > struct mtu3_request *mreq; > > unsigned long flags; > > int ret = 0; > > @@ -382,6 +389,9 @@ static int mtu3_gadget_ep_set_halt(struct usb_ep *ep, int value) > > if (!ep) > > return -EINVAL; > > Same here, how can that ever happen? Maybe when the class driver has something wrong:) You mean it's better to remove these unnecessary checks? Thanks > > > > > + mep = to_mtu3_ep(ep); > > + mtu = mep->mtu; > > + > > dev_dbg(mtu->dev, "%s : %s...", __func__, ep->name); > > > > spin_lock_irqsave(&mtu->lock, flags); > > @@ -422,11 +432,12 @@ static int mtu3_gadget_ep_set_halt(struct usb_ep *ep, int value) > > /* Sets the halt feature with the clear requests ignored */ > > static int mtu3_gadget_ep_set_wedge(struct usb_ep *ep) > > { > > - struct mtu3_ep *mep = to_mtu3_ep(ep); > > + struct mtu3_ep *mep; > > > > if (!ep) > > return -EINVAL; > > Again, same here. > > thanks, > > greg k-h _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71881C433E0 for ; Thu, 2 Jul 2020 02:55:01 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 05F2C207F5 for ; Thu, 2 Jul 2020 02:55:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="0ah1i3fq"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="aLSG1kWm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 05F2C207F5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Date:To:From: Subject:Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=+wtn3LnumeiBL/wnNKxfsCv29LKZyaCT2IeUfnhivmE=; b=0ah1i3fqHJKNCWzZmLZuPjPyk +pm6aYHOaTYycyG7hNx5s1ZW42tZpgZb5gixNZSDYgExqXsL9kxUp3+8RLX/4qLauKMslRswNfAfa q/AkMXDwvu+SBetCQIH+oE+/yoo4qQy5sAtwI+02T4boq1YwrFXqajQFa5RdEfyl0HjD+bI5a9hDY pmJkZxYBEnd8Q//ej1LWEsy8jHrsS9ZjOTgJPb8l1+mZQZRadLusPpPdFxtncpqYJcsOmjCuLauq6 Mu6dIP7VS2X8OeU7KXEZbuhgjwWhCuZprOH7MRhOYsRi0VjqwlXz8lPi52uGgWINKjZCCL78HommT Y2rRMP3Ew==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqpLu-0001N1-9k; Thu, 02 Jul 2020 02:53:30 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqpLr-0001MC-LL; Thu, 02 Jul 2020 02:53:28 +0000 X-UUID: d38d504bc70a4920867738f294b337d1-20200701 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=afpaC7qRGVZ6JRFynQgro+7OJFSDdHfSPLeLJ/lq7kQ=; b=aLSG1kWmHRehrrGQ3rqzjfigMarWaiFUhQ7v78o07HneYshjxm0TtsjxlfDJ93oVg48TrHNcYz/mTSwKXH2FX3xrwX0W8pO9A89pAl6spVO2XB7nXm8UocNMJ6AfRRU1t1SHBFdrmGxJHPd54OoLXPkaB+PsXp4NdKb2UAlrIFQ=; X-UUID: d38d504bc70a4920867738f294b337d1-20200701 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1247762619; Wed, 01 Jul 2020 18:53:19 -0800 Received: from MTKMBS32N1.mediatek.inc (172.27.4.71) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 1 Jul 2020 19:53:17 -0700 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS32N1.mediatek.inc (172.27.4.71) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 2 Jul 2020 10:53:14 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 2 Jul 2020 10:53:09 +0800 Message-ID: <1593658371.23885.16.camel@mhfsdcap03> Subject: Re: [V2 PATCH] usb: mtu3: fix NULL pointer dereference From: Chunfeng Yun To: Greg Kroah-Hartman Date: Thu, 2 Jul 2020 10:52:51 +0800 In-Reply-To: <20200701115821.GA2184169@kroah.com> References: <1593502942-24455-1-git-send-email-chunfeng.yun@mediatek.com> <20200701115821.GA2184169@kroah.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: 9F8CFEA6CEBAFB7D9D5D9DF806B368CC530AA52FD6E6FE9C3269E92BF6BF031F2000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200701_225327_827536_43EF5226 X-CRM114-Status: GOOD ( 21.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Felipe Balbi , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Matthias Brugger , Markus Elfring , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, 2020-07-01 at 13:58 +0200, Greg Kroah-Hartman wrote: > On Tue, Jun 30, 2020 at 03:42:22PM +0800, Chunfeng Yun wrote: > > Some pointers are dereferenced before successful checks. > > > > Reported-by: Markus Elfring > > Signed-off-by: Chunfeng Yun > > --- > > v2: nothing changed, but abandon another patch > > --- > > drivers/usb/mtu3/mtu3_gadget.c | 25 ++++++++++++++++++------- > > 1 file changed, 18 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/usb/mtu3/mtu3_gadget.c b/drivers/usb/mtu3/mtu3_gadget.c > > index f93732e..1689ca8 100644 > > --- a/drivers/usb/mtu3/mtu3_gadget.c > > +++ b/drivers/usb/mtu3/mtu3_gadget.c > > @@ -332,14 +332,21 @@ static int mtu3_gadget_queue(struct usb_ep *ep, > > > > static int mtu3_gadget_dequeue(struct usb_ep *ep, struct usb_request *req) > > { > > - struct mtu3_ep *mep = to_mtu3_ep(ep); > > - struct mtu3_request *mreq = to_mtu3_request(req); > > + struct mtu3_ep *mep; > > + struct mtu3_request *mreq; > > struct mtu3_request *r; > > + struct mtu3 *mtu; > > unsigned long flags; > > int ret = 0; > > - struct mtu3 *mtu = mep->mtu; > > > > - if (!ep || !req || mreq->mep != mep) > > + if (!ep || !req) > > + return -EINVAL; > > How will either of those ever be NULL? The kernel will not call this > function with either of them being NULL, right? Yes, I find all class drivers already ensure they are not NULL. > > > + > > + mep = to_mtu3_ep(ep); > > + mtu = mep->mtu; > > + > > + mreq = to_mtu3_request(req); > > + if (mreq->mep != mep) > > return -EINVAL; > > > > dev_dbg(mtu->dev, "%s : req=%p\n", __func__, req); > > @@ -373,8 +380,8 @@ static int mtu3_gadget_dequeue(struct usb_ep *ep, struct usb_request *req) > > */ > > static int mtu3_gadget_ep_set_halt(struct usb_ep *ep, int value) > > { > > - struct mtu3_ep *mep = to_mtu3_ep(ep); > > - struct mtu3 *mtu = mep->mtu; > > + struct mtu3_ep *mep; > > + struct mtu3 *mtu; > > struct mtu3_request *mreq; > > unsigned long flags; > > int ret = 0; > > @@ -382,6 +389,9 @@ static int mtu3_gadget_ep_set_halt(struct usb_ep *ep, int value) > > if (!ep) > > return -EINVAL; > > Same here, how can that ever happen? Maybe when the class driver has something wrong:) You mean it's better to remove these unnecessary checks? Thanks > > > > > + mep = to_mtu3_ep(ep); > > + mtu = mep->mtu; > > + > > dev_dbg(mtu->dev, "%s : %s...", __func__, ep->name); > > > > spin_lock_irqsave(&mtu->lock, flags); > > @@ -422,11 +432,12 @@ static int mtu3_gadget_ep_set_halt(struct usb_ep *ep, int value) > > /* Sets the halt feature with the clear requests ignored */ > > static int mtu3_gadget_ep_set_wedge(struct usb_ep *ep) > > { > > - struct mtu3_ep *mep = to_mtu3_ep(ep); > > + struct mtu3_ep *mep; > > > > if (!ep) > > return -EINVAL; > > Again, same here. > > thanks, > > greg k-h _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel