From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-858731-1516767656-2-6011235035572271547 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=1516767656; b=qOxEvp72trcs4aOIcNcZRh3W4Ki34Xz0A7I7/L3FkmlByAF Ii5kmSbZVmpiVlrQHxy/xZTVO2UPNlVBngQdbqAWRcjFpL3zTZDvI/BUdnTnmi5M JRZWCOGCx/1fy5gYortB2z3xsJcSMd/7udQFPVUyVb7sz4Wx7exbvgHoP+pi6vQh IrsV0d8n0c0ClSEayohC2z/OMFmEI9z2vaeTvBLWePfGCBMN2Ng4DvT6yuzWR7jq kzG1SvkxK7S/8uodzTQ/uDXWudc6vhf/J5QCLEH/yMSonmndT/W4LhtiNnf9SzYw oVdkO5yog5Fm6kuRH/c/f4E8/Xj9WfbzVLRcLjQ== 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=1516767656; bh=/GhTU1 fSBA6dHEBaSAesCunjgLAkJHHuBze5oO/9+5o=; b=JZFhw4gzL8r2E6MZ+5ohzL 727egihTsyyNoAZy1k81WJ6OhVXLyQVEWWo9uGAIWniArsq4BKK6TkSJbFa1wlAy h+WF7VKWFs5M8K7D9qPl0wwOQONeDtZ1RwQYb8T1v5cYEfMiP7sd89ZSKr0HWpJP yIVEJ1WKkx1KojJeoToXoE0To/3Pe414ZhUVC78mwOPIYri92Z3VXCCHB6pwOD/o I8S05iBgDTzj/VDab8ZxeHILbvR2Lq1XtHfGifFfqo5l4nA5NaXaBzhUWgQ2M17+ iOCEb6p5Tij4XWtY8oyDgibevFawTO6Q+8wn9pCzxlDIyaB1fxGgTjo741t/OFVg == 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=VX0Z4r1U 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=VX0Z4r1U 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 S933357AbeAXEUO (ORCPT ); Tue, 23 Jan 2018 23:20:14 -0500 Received: from mail-cys01nam02on0129.outbound.protection.outlook.com ([104.47.37.129]:44357 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933333AbeAXEUM (ORCPT ); Tue, 23 Jan 2018 23:20:12 -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 3.18 15/16] usb: gadget: don't dereference g until after it has been null checked Thread-Topic: [PATCH AUTOSEL for 3.18 15/16] usb: gadget: don't dereference g until after it has been null checked Thread-Index: AQHTlMpA75iskqUNMEG84DbrJZEY9g== Date: Wed, 24 Jan 2018 04:17:30 +0000 Message-ID: <20180124041716.32520-15-alexander.levin@microsoft.com> References: <20180124041716.32520-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041716.32520-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;DM5PR2101MB0872;7:/mANTrer+KOXpPALA3o9lz30wJX12Ngzn0+qgazs+zv0pAQ5lizhAQG0Kqz6DSpTDcLnPshLSusPdYwhthAzsXDgZcRuMW8gmSjogP63sxMKzqhY5V6JefSFLsSeW5+MsDJy+4RnqtwHx3lX/G7S+xNIuRfAW5XbLD/u46oKoav1fhN02FioYknEBaDTazVK/wV2Wfh5sXPiUcn5DDF7nKwFIwf6iVbqS/atk9YXECpLxszrnPZUUpWfCqMjPzat x-ms-office365-filtering-correlation-id: 8a0f19cc-4688-4a68-79ba-08d562e1c000 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:DM5PR2101MB0872; x-ms-traffictypediagnostic: DM5PR2101MB0872: 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)(93006095)(93001095)(3002001)(10201501046)(3231046)(2400081)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:DM5PR2101MB0872;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0872; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39380400002)(396003)(366004)(346002)(376002)(39860400002)(199004)(189003)(5660300001)(106356001)(72206003)(3280700002)(5250100002)(66066001)(3660700001)(105586002)(14454004)(86612001)(478600001)(53936002)(2900100001)(10290500003)(2501003)(6512007)(10090500001)(6436002)(6506007)(36756003)(6116002)(3846002)(575784001)(6486002)(2906002)(22452003)(107886003)(316002)(54906003)(4326008)(110136005)(6346003)(81166006)(25786009)(26005)(2950100002)(6666003)(86362001)(1076002)(8676002)(7736002)(81156014)(99286004)(305945005)(76176011)(68736007)(97736004)(102836004)(8936002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0872;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: Wxj1PgZ17yAwPXDCND131sy3YwofQDu7MpMFwvY0h6y6wUxKh9jcpL6p1E4In2oGnGUco1cG8Ncpn8uGNe4ETQ== 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: 8a0f19cc-4688-4a68-79ba-08d562e1c000 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:17:30.6547 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0872 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 f24adf48b0cc..0056ca7e588c 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -103,7 +103,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 @@ -170,8 +169,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