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=-10.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MIME_BASE64_TEXT,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_GIT 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 30BCBC433DF for ; Tue, 30 Jun 2020 07:43:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0203A207FF for ; Tue, 30 Jun 2020 07:43:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="QvcLyBiH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731191AbgF3HnM (ORCPT ); Tue, 30 Jun 2020 03:43:12 -0400 Received: from mailgw02.mediatek.com ([1.203.163.81]:3025 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1731148AbgF3HnI (ORCPT ); Tue, 30 Jun 2020 03:43:08 -0400 X-UUID: 204592bd81da417395f4e1d8f98ebfbf-20200630 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=UdlqnIpqX91+qcJu2d7pulF4nEY7A/HDqmQfaO6yNK4=; b=QvcLyBiHAc7o4RfjtJxOqKNe3OW7yML7zkp1ea/tBGkaQ9mFcmwI5dBhOF6HY5Kj4xz9iduxPaNEbbjqCA07CNZy6CkOMa7PS/6u+Vu27inL0ab7hNhDN+1uGx5/fU/pYANHg2gSLUxJBqFSNpmBfQxJ+AKxFUfzcsUomtl6JQs=; X-UUID: 204592bd81da417395f4e1d8f98ebfbf-20200630 Received: from mtkcas35.mediatek.inc [(172.27.4.253)] by mailgw02.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLS) with ESMTP id 1196866331; Tue, 30 Jun 2020 15:43:00 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by MTKMBS31DR.mediatek.inc (172.27.6.102) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 30 Jun 2020 15:42:58 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 30 Jun 2020 15:42:58 +0800 From: Chunfeng Yun To: Greg Kroah-Hartman , Felipe Balbi CC: Matthias Brugger , Markus Elfring , Chunfeng Yun , , , , Subject: [V2 PATCH] usb: mtu3: fix NULL pointer dereference Date: Tue, 30 Jun 2020 15:42:22 +0800 Message-ID: <1593502942-24455-1-git-send-email-chunfeng.yun@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty MIME-Version: 1.0 Content-Type: text/plain X-TM-SNTS-SMTP: BBCAD5F173D4D802F40271206CF74BA46974853C7E2A6E35343B12D1811A5EB22000: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 U29tZSBwb2ludGVycyBhcmUgZGVyZWZlcmVuY2VkIGJlZm9yZSBzdWNjZXNzZnVsIGNoZWNrcy4N Cg0KUmVwb3J0ZWQtYnk6IE1hcmt1cyBFbGZyaW5nIDxNYXJrdXMuRWxmcmluZ0B3ZWIuZGU+DQpT aWduZWQtb2ZmLWJ5OiBDaHVuZmVuZyBZdW4gPGNodW5mZW5nLnl1bkBtZWRpYXRlay5jb20+DQot LS0NCnYyOiBub3RoaW5nIGNoYW5nZWQsIGJ1dCBhYmFuZG9uIGFub3RoZXIgcGF0Y2gNCi0tLQ0K IGRyaXZlcnMvdXNiL210dTMvbXR1M19nYWRnZXQuYyB8IDI1ICsrKysrKysrKysrKysrKysrKy0t LS0tLS0NCiAxIGZpbGUgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkN Cg0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL210dTMvbXR1M19nYWRnZXQuYyBiL2RyaXZlcnMv dXNiL210dTMvbXR1M19nYWRnZXQuYw0KaW5kZXggZjkzNzMyZS4uMTY4OWNhOCAxMDA2NDQNCi0t LSBhL2RyaXZlcnMvdXNiL210dTMvbXR1M19nYWRnZXQuYw0KKysrIGIvZHJpdmVycy91c2IvbXR1 My9tdHUzX2dhZGdldC5jDQpAQCAtMzMyLDE0ICszMzIsMjEgQEAgc3RhdGljIGludCBtdHUzX2dh ZGdldF9xdWV1ZShzdHJ1Y3QgdXNiX2VwICplcCwNCiANCiBzdGF0aWMgaW50IG10dTNfZ2FkZ2V0 X2RlcXVldWUoc3RydWN0IHVzYl9lcCAqZXAsIHN0cnVjdCB1c2JfcmVxdWVzdCAqcmVxKQ0KIHsN Ci0Jc3RydWN0IG10dTNfZXAgKm1lcCA9IHRvX210dTNfZXAoZXApOw0KLQlzdHJ1Y3QgbXR1M19y ZXF1ZXN0ICptcmVxID0gdG9fbXR1M19yZXF1ZXN0KHJlcSk7DQorCXN0cnVjdCBtdHUzX2VwICpt ZXA7DQorCXN0cnVjdCBtdHUzX3JlcXVlc3QgKm1yZXE7DQogCXN0cnVjdCBtdHUzX3JlcXVlc3Qg KnI7DQorCXN0cnVjdCBtdHUzICptdHU7DQogCXVuc2lnbmVkIGxvbmcgZmxhZ3M7DQogCWludCBy ZXQgPSAwOw0KLQlzdHJ1Y3QgbXR1MyAqbXR1ID0gbWVwLT5tdHU7DQogDQotCWlmICghZXAgfHwg IXJlcSB8fCBtcmVxLT5tZXAgIT0gbWVwKQ0KKwlpZiAoIWVwIHx8ICFyZXEpDQorCQlyZXR1cm4g LUVJTlZBTDsNCisNCisJbWVwID0gdG9fbXR1M19lcChlcCk7DQorCW10dSA9IG1lcC0+bXR1Ow0K Kw0KKwltcmVxID0gdG9fbXR1M19yZXF1ZXN0KHJlcSk7DQorCWlmIChtcmVxLT5tZXAgIT0gbWVw KQ0KIAkJcmV0dXJuIC1FSU5WQUw7DQogDQogCWRldl9kYmcobXR1LT5kZXYsICIlcyA6IHJlcT0l cFxuIiwgX19mdW5jX18sIHJlcSk7DQpAQCAtMzczLDggKzM4MCw4IEBAIHN0YXRpYyBpbnQgbXR1 M19nYWRnZXRfZGVxdWV1ZShzdHJ1Y3QgdXNiX2VwICplcCwgc3RydWN0IHVzYl9yZXF1ZXN0ICpy ZXEpDQogICovDQogc3RhdGljIGludCBtdHUzX2dhZGdldF9lcF9zZXRfaGFsdChzdHJ1Y3QgdXNi X2VwICplcCwgaW50IHZhbHVlKQ0KIHsNCi0Jc3RydWN0IG10dTNfZXAgKm1lcCA9IHRvX210dTNf ZXAoZXApOw0KLQlzdHJ1Y3QgbXR1MyAqbXR1ID0gbWVwLT5tdHU7DQorCXN0cnVjdCBtdHUzX2Vw ICptZXA7DQorCXN0cnVjdCBtdHUzICptdHU7DQogCXN0cnVjdCBtdHUzX3JlcXVlc3QgKm1yZXE7 DQogCXVuc2lnbmVkIGxvbmcgZmxhZ3M7DQogCWludCByZXQgPSAwOw0KQEAgLTM4Miw2ICszODks OSBAQCBzdGF0aWMgaW50IG10dTNfZ2FkZ2V0X2VwX3NldF9oYWx0KHN0cnVjdCB1c2JfZXAgKmVw LCBpbnQgdmFsdWUpDQogCWlmICghZXApDQogCQlyZXR1cm4gLUVJTlZBTDsNCiANCisJbWVwID0g dG9fbXR1M19lcChlcCk7DQorCW10dSA9IG1lcC0+bXR1Ow0KKw0KIAlkZXZfZGJnKG10dS0+ZGV2 LCAiJXMgOiAlcy4uLiIsIF9fZnVuY19fLCBlcC0+bmFtZSk7DQogDQogCXNwaW5fbG9ja19pcnFz YXZlKCZtdHUtPmxvY2ssIGZsYWdzKTsNCkBAIC00MjIsMTEgKzQzMiwxMiBAQCBzdGF0aWMgaW50 IG10dTNfZ2FkZ2V0X2VwX3NldF9oYWx0KHN0cnVjdCB1c2JfZXAgKmVwLCBpbnQgdmFsdWUpDQog LyogU2V0cyB0aGUgaGFsdCBmZWF0dXJlIHdpdGggdGhlIGNsZWFyIHJlcXVlc3RzIGlnbm9yZWQg Ki8NCiBzdGF0aWMgaW50IG10dTNfZ2FkZ2V0X2VwX3NldF93ZWRnZShzdHJ1Y3QgdXNiX2VwICpl cCkNCiB7DQotCXN0cnVjdCBtdHUzX2VwICptZXAgPSB0b19tdHUzX2VwKGVwKTsNCisJc3RydWN0 IG10dTNfZXAgKm1lcDsNCiANCiAJaWYgKCFlcCkNCiAJCXJldHVybiAtRUlOVkFMOw0KIA0KKwlt ZXAgPSB0b19tdHUzX2VwKGVwKTsNCiAJbWVwLT53ZWRnZWQgPSAxOw0KIA0KIAlyZXR1cm4gdXNi X2VwX3NldF9oYWx0KGVwKTsNCi0tIA0KMS45LjENCg== 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=-10.0 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_GIT 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 60D1AC433DF for ; Tue, 30 Jun 2020 07:43:18 +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 2FF43207FF for ; Tue, 30 Jun 2020 07:43:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="xEp/9hMy"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="QvcLyBiH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2FF43207FF 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:Message-ID:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=GNAZWknsZXm7NBdRSxQXDLq8p8/lYutjWRldeqQyVfk=; b=xEp/9hMyx6t2qRcnJUD95gtxCT JLwBn88nvoRVLNOvuQykq8H7xqgz4IemdH9QCZJKCjExeFF7U6k6FgBJ+TEupcHOAY7ez8Saoa8RG cM75rM178TaZA9VEEMj24U6QeZQjr6QgRz95xPC7uXyGpDkqQbS2BzdjQevMbGBJr5nVpss3a9quL pVl9tadvhjKfwy4ihfnXuEZacnNtdqrgMdGhdZgpKVREf/iivH34HklvdK20yH8LmITopdACYpnt+ JWlgs0NSuI8xc7wJ/+n283kvASmP1vR6FohHxwYsUhL2zwNtnFcyPFgUJBVEd+tfx3fyN15SLU7WC tElH6OuQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqAv7-0000XY-MO; Tue, 30 Jun 2020 07:43:09 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqAv5-0000X7-9z; Tue, 30 Jun 2020 07:43:08 +0000 X-UUID: 4f6f847df7e0429f94191894f1f141b8-20200629 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=UdlqnIpqX91+qcJu2d7pulF4nEY7A/HDqmQfaO6yNK4=; b=QvcLyBiHAc7o4RfjtJxOqKNe3OW7yML7zkp1ea/tBGkaQ9mFcmwI5dBhOF6HY5Kj4xz9iduxPaNEbbjqCA07CNZy6CkOMa7PS/6u+Vu27inL0ab7hNhDN+1uGx5/fU/pYANHg2gSLUxJBqFSNpmBfQxJ+AKxFUfzcsUomtl6JQs=; X-UUID: 4f6f847df7e0429f94191894f1f141b8-20200629 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1139529948; Mon, 29 Jun 2020 23:42:55 -0800 Received: from MTKMBS31DR.mediatek.inc (172.27.6.102) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 30 Jun 2020 00:43:01 -0700 Received: from mtkcas07.mediatek.inc (172.21.101.84) by MTKMBS31DR.mediatek.inc (172.27.6.102) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 30 Jun 2020 15:42:58 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 30 Jun 2020 15:42:58 +0800 From: Chunfeng Yun To: Greg Kroah-Hartman , Felipe Balbi Subject: [V2 PATCH] usb: mtu3: fix NULL pointer dereference Date: Tue, 30 Jun 2020 15:42:22 +0800 Message-ID: <1593502942-24455-1-git-send-email-chunfeng.yun@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty MIME-Version: 1.0 X-TM-SNTS-SMTP: BBCAD5F173D4D802F40271206CF74BA46974853C7E2A6E35343B12D1811A5EB22000:8 X-MTK: N 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: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Chunfeng Yun , 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 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; + + 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; + 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; + mep = to_mtu3_ep(ep); mep->wedged = 1; return usb_ep_set_halt(ep); -- 1.9.1 _______________________________________________ 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=-10.0 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_GIT 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 F0593C433E0 for ; Tue, 30 Jun 2020 07:44:25 +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 BF5C6206CB for ; Tue, 30 Jun 2020 07:44:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="agnhQ6Rm"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="QvcLyBiH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF5C6206CB 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:Message-ID:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=dH1NtcXZBarc/5+wdazdxdBfqAdDaCXZ/AA+UWq1sxI=; b=agnhQ6RmnSa/CqIwDNHZ+MuySc 63kKWxnuf12t4zheZ/FHXMG0uzsmSS1SmFI/lj/svxiW3ULFiM2prMEp+cUrDIcCie4yxKphBVTaf subD1iRW7HWM+tbCKFkZb+38o8ShsmsdOlMqytydHvQPfAc+BqrYQOVQurEXelGq5g90BteGPKTDM +7tqEoOkDlEumdR3E5wDwp0BwCEUEFKAickOEkpVXDZJ95U3H5HDVa690s/9E6PzWnMfwVyN3GFHT z6jNlNYGkiUd1r8XJb3mhm3zUzEfsud3gqwU4mY+Uw1gseNX7PyAN5Wi+v0e2fX4EKelyLsuUKvlL H0Pw9y3g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqAv8-0000Xq-O2; Tue, 30 Jun 2020 07:43:10 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqAv5-0000X7-9z; Tue, 30 Jun 2020 07:43:08 +0000 X-UUID: 4f6f847df7e0429f94191894f1f141b8-20200629 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=UdlqnIpqX91+qcJu2d7pulF4nEY7A/HDqmQfaO6yNK4=; b=QvcLyBiHAc7o4RfjtJxOqKNe3OW7yML7zkp1ea/tBGkaQ9mFcmwI5dBhOF6HY5Kj4xz9iduxPaNEbbjqCA07CNZy6CkOMa7PS/6u+Vu27inL0ab7hNhDN+1uGx5/fU/pYANHg2gSLUxJBqFSNpmBfQxJ+AKxFUfzcsUomtl6JQs=; X-UUID: 4f6f847df7e0429f94191894f1f141b8-20200629 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1139529948; Mon, 29 Jun 2020 23:42:55 -0800 Received: from MTKMBS31DR.mediatek.inc (172.27.6.102) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 30 Jun 2020 00:43:01 -0700 Received: from mtkcas07.mediatek.inc (172.21.101.84) by MTKMBS31DR.mediatek.inc (172.27.6.102) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 30 Jun 2020 15:42:58 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 30 Jun 2020 15:42:58 +0800 From: Chunfeng Yun To: Greg Kroah-Hartman , Felipe Balbi Subject: [V2 PATCH] usb: mtu3: fix NULL pointer dereference Date: Tue, 30 Jun 2020 15:42:22 +0800 Message-ID: <1593502942-24455-1-git-send-email-chunfeng.yun@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty MIME-Version: 1.0 X-TM-SNTS-SMTP: BBCAD5F173D4D802F40271206CF74BA46974853C7E2A6E35343B12D1811A5EB22000:8 X-MTK: N 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: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Chunfeng Yun , 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 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; + + 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; + 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; + mep = to_mtu3_ep(ep); mep->wedged = 1; return usb_ep_set_halt(ep); -- 1.9.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel