From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-874563-1516768454-2-17563353556751720391 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516768454; b=U/3UIiEFWVgNnTxkmN5bJwC1/TRQ3rrgOISDQNChyQ7ba4A BhnZePuXCkQjchDhiN/4RoNSiUMQXpltC6xAfn8qx1l1XFu+L+kp2836b5eI6H7q +V5VBYI4Mw3eVyZf5qulWczerL4REQU816PI4b2jQG8T7tmdpg82cVqFzJsD6PU0 NfsTTFY94TJTbWvG3DelwSx61Nnat99poFosTcHx8BPNcJsw6MQ6PqNqpiNIbbB8 4I5G2av7ZBlr6NvIkRbFPMugTWopKwOqRzzrqrQfNbBh5d3KhwD7DBWa0p89v763 YL++fGfQKbol9K5YJnJABS1He39/nAl+5q8x9IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1516768454; bh=xf7lJi 1n+ocTOR1hb+7XnN/3ibwdqE8XXlkkuhkhg50=; b=Z2A7xyb2ir9aOI85ZUL4fx VO+3rpvCiHh7vQPiu6DPw9wbY1pI6Nt4KuueJXBAXNdVRB5t+F31WrfQOixFqr+N vfup1Q4WA+JymOS/Cmd7AJwKZHTb2bzsRf/AU3nXlG5RndHx+LVotRpXSxH3bcMx ggrh5tZ1EexeH1Ngx61hp409F5vWUpNagBe+yGqVnG8pnuoPp/xeRzKkfWrILRPM AvTtunX1ro/dXOzg9Sj98vck5faH8QuDTCO0UoU5ll/cuFbROFFKuEsuwEwcqfMG Ou2g0JMkNBFEcaqX8TBCin3VnAesUt3J4f0bxdOE3Rs2wC+KUGSA+yM5g6L3KiEQ == ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=l73BAp0K x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=l73BAp0K x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932915AbeAXEdp (ORCPT ); Tue, 23 Jan 2018 23:33:45 -0500 Received: from mail-by2nam03on0132.outbound.protection.outlook.com ([104.47.42.132]:14154 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932753AbeAXETQ (ORCPT ); Tue, 23 Jan 2018 23:19:16 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Colin Ian King , Felipe Balbi , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 54/55] usb: gadget: don't dereference g until after it has been null checked Thread-Topic: [PATCH AUTOSEL for 4.9 54/55] usb: gadget: don't dereference g until after it has been null checked Thread-Index: AQHTlMoJFSa4i3NKW0KqVRmiYPwraQ== Date: Wed, 24 Jan 2018 04:15:58 +0000 Message-ID: <20180124041521.32223-54-alexander.levin@microsoft.com> References: <20180124041521.32223-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041521.32223-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB1032;7:LJ2pMB07lVov0USDl9B1iBH8EV5+ncn8UIcibyUUSMzuT3L35w3ggjrZZ2iYzkCQY1eks4jrJir44PruyH6c+1xqw67BcQcaz7MefJfDlmYqxzYbIOmc1781+oWoZiBIGtlmC+d+O955jCG3jeWhXh59mubIy3d1x/9nlmIeVorpezp3h0SNDgfrMzOqREWdDYszq38HfvOOPcD7gnNJ1Vpo3vjf2xHM80p5hKYsI/BT42hR730kANBEN4dRuxME x-ms-office365-filtering-correlation-id: 8edd14cb-244b-455f-de49-08d562e1a068 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020);SRVR:DM5PR2101MB1032; x-ms-traffictypediagnostic: DM5PR2101MB1032: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(198206253151910)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231046)(2400081)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:DM5PR2101MB1032;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1032; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(396003)(39860400002)(376002)(346002)(39380400002)(189003)(199004)(36756003)(478600001)(6506007)(8676002)(14454004)(6512007)(53936002)(5660300001)(26005)(72206003)(4326008)(25786009)(81156014)(81166006)(8936002)(86362001)(575784001)(10290500003)(68736007)(2906002)(6346003)(99286004)(6666003)(86612001)(76176011)(6436002)(102836004)(7736002)(2950100002)(66066001)(1076002)(10090500001)(54906003)(22452003)(316002)(105586002)(106356001)(5250100002)(305945005)(2501003)(3846002)(3280700002)(97736004)(2900100001)(6486002)(6116002)(110136005)(3660700001)(107886003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1032;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: VwQEGAAvE9kzMaUinsKIx8Ctu6GWVrKEq6PM8Fc+gvTfnvQ2f7YyO9uv0fG71PuiJmDq7DkMFSxdUI4Mi/G45A== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8edd14cb-244b-455f-de49-08d562e1a068 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:15:58.1863 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1032 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Colin Ian King [ Upstream commit b2fc059fa549fe6881d4c1f8d698b0f50bcd16ec ] Avoid dereferencing pointer g until after g has been sanity null checked; move the assignment of cdev much later when it is required into a more local scope. Detected by CoverityScan, CID#1222135 ("Dereference before null check") Fixes: b785ea7ce662 ("usb: gadget: composite: fix ep->maxburst initializati= on") Signed-off-by: Colin Ian King Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- drivers/usb/gadget/composite.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.= c index 325bf21ba13b..406758ed0b23 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -150,7 +150,6 @@ int config_ep_by_speed(struct usb_gadget *g, struct usb_function *f, struct usb_ep *_ep) { - struct usb_composite_dev *cdev =3D get_gadget_data(g); struct usb_endpoint_descriptor *chosen_desc =3D NULL; struct usb_descriptor_header **speed_desc =3D NULL; =20 @@ -229,8 +228,12 @@ ep_found: _ep->maxburst =3D comp_desc->bMaxBurst + 1; break; default: - if (comp_desc->bMaxBurst !=3D 0) + if (comp_desc->bMaxBurst !=3D 0) { + struct usb_composite_dev *cdev; + + cdev =3D get_gadget_data(g); ERROR(cdev, "ep0 bMaxBurst must be 0\n"); + } _ep->maxburst =3D 1; break; } --=20 2.11.0