From patchwork Tue Oct 31 19:49:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trent Piepho X-Patchwork-Id: 10035293 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3910B602B5 for ; Tue, 31 Oct 2017 19:49:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A1182808F for ; Tue, 31 Oct 2017 19:49:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1EC512837D; Tue, 31 Oct 2017 19:49:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 711C02808F for ; Tue, 31 Oct 2017 19:49:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932660AbdJaTtf (ORCPT ); Tue, 31 Oct 2017 15:49:35 -0400 Received: from mail-by2nam03on0110.outbound.protection.outlook.com ([104.47.42.110]:42548 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932510AbdJaTte (ORCPT ); Tue, 31 Oct 2017 15:49:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=impinj.onmicrosoft.com; s=selector1-impinj-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=n7Ao6RPCR94Buplg4BPG00/U/xV7MrPLleo7CgQTrU0=; b=OmHH7IXJsxelMv5FTfYfwyEdCWFgx/hQuqyXaO8ih/rpsHFG71IT2W7Om/oGfffzwaWS+Uote9s25FG8FeUJbHc2v0cE/7GyCgU50UElcGO1vKOPFdSRa4SVOIeX5Lba5KImLzLnxIYFt6JGPlQ1yysGZK73xRgGnnsc8OZGhVQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=tpiepho@impinj.com; Received: from impinj.com (216.243.31.162) by CY4PR06MB2808.namprd06.prod.outlook.com (10.175.118.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.178.6; Tue, 31 Oct 2017 19:49:32 +0000 From: Trent Piepho To: linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Trent Piepho , Shawn Guo , Sascha Hauer , Fabio Estevam , Mark Brown , Oleksij Rempel Subject: [PATCH v3 2/4] spi: imx: Fix failure path leak on GPIO request error Date: Tue, 31 Oct 2017 12:49:05 -0700 Message-Id: <20171031194907.29108-3-tpiepho@impinj.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171031194907.29108-1-tpiepho@impinj.com> References: <20171031194907.29108-1-tpiepho@impinj.com> MIME-Version: 1.0 X-Originating-IP: [216.243.31.162] X-ClientProxiedBy: MWHPR22CA0020.namprd22.prod.outlook.com (10.172.163.158) To CY4PR06MB2808.namprd06.prod.outlook.com (10.175.118.8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 18853cd1-4713-496d-7d4f-08d52098821d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(2017052603238); SRVR:CY4PR06MB2808; X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2808; 3:brWr2sWUFXMw9fuyXJSoVMC4c0jcscodctYE5cSfbNTTsC1Lc8yonL3pHtl8ADO0IQjLHRQbkc3A7ekh+K0brYhyYMz3HVyFwO6Jga9sg+FNJekrPQij/OzJqeWesUvbFrp0gpTguC/9qYew8Gf+LDXJusvF611H4wJxkNEAGVpkNq1WOvFTszwlNs81u9aW3dPUEVd6og1okkPSuXWUD4mdyvRWd7sUoQ1GsS2f9+REeT4RcKMPmEnGBHJmJEGx; 25:Pd9zRuiePerDLFGVuXWtdbmWzdJ5RNIwa5SnSTTnos31gixy0crVe/q/OCzeBQ3pddhQMGuCvPY0rvbZwNrpBknhet55Hh+3uYBC+BY7/jbBz33cNjzShasGKNOC/O3uAVKBSh2jY210XewTG8jqDa3uMMJAkZTyz+BCPuAy0GilTipk3YWLiv4XuYEwa3cuDJPTTileA1bP1kEYcOfu8TFGLyXHSNaa+HhxJ34sldFDT/d9JK3s7DJB7HvOMhB8x5n45RZIjycZcrKPaKzglU8tdvNOYM9D4bbv/5nkg7qFz0op2j7QQF8wOh6OUwHSzCYKjrFgQM9fzHFOqebJ1Q==; 31:nN14SQGcbFBVNz8GCLMNnZqjM5M/MjR0EC4PC4TnUDqsQ2X2k0bmnk4XHV+0WyqagHHdIUU2bOcx2Bygyy27TbSq0/KzFAPEhquNGXnrvlmaL2XP/v96bLtG+ZcdktLE6Enqu8hT1ffFIUZUc2Vr9/x5D+wv9WSqtifnVwD72BW8ylPg8L0gnKhf+Y0BCNkbEToaf+z9lMswF+Cb02PadlNGuRgkGMGGO+DZpFkUECA= X-MS-TrafficTypeDiagnostic: CY4PR06MB2808: X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2808; 20:k89C1pft3lFYq+xXCn4qVHsFMdbKVlqmKsdrRmiL5qN/RNzirePLCc584z+jE3BjzTnI9yhmkvL6SkJ0WAanpQNnz8a3E9/F7smusXNmOYe1cN7Fr9JqlIoQ30naQF155qRt7dNE09zUjaIYOL17lZD5FEwJT4CI0q5w9NHxtu9srm1kOYBLH06ZVzGS0+nOgPxTRHORHfvoWoCtYzfUcn5dmJ7Rg9Bnud09JS9DzMJrJhQ62FAbwtBrb5ViKIw5tnhlS4sTDnnGefTzZrUsmoI9kIQq/mnCXoF699S1bqn8W9S7MjUbNcgt2Zw+oj22AY6lnvscCg5AhZ8zXUL6mSxA2EyywLSyaRkMhYDyJZGgEvEEZrGpdMEx4+GzWWkwURRlaOta2QM6/1VLqWAJEb9C/s5L4cHh+Emt4Gj431Ro+Km/UwgKuKQMnA7Z13euOaxW1azdXzuu9qJs4CwUKHC+rbuvLl6d3L1LMzGd8Im+cn5ocl6ROK4hbWaeUoZX; 4:T6j9qT0vFAb9Mrnn80O/2XGZeTaxJtPzj/koXIqN3kL6ZdiHy9yk2pSj25XLxQCTGv12rFNJysUOb3lD6FOqULoF10vYvkzBEp2cqk7kJME/yJaWO5Z2kl2vQnOphaBUH0lQWLtq8FYnQW/DH1lJ/7KrDABcrAnJqlnu8fsKiNSI/3h0FjP84YtXVdESVVEXra9qUdobGZFRiNuIdbgXf4xYkee3V3vPEWCMgi2uqF21of2r/8NA7dkKXvkXSpb1IkWT1sgiA21J9+bFfFmJyEPD3pExdhhohD2/0ZxO8hJvfWsMZHe0IW2YpYr3x21x X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231020)(100000703101)(100105400095)(6041248)(20161123560025)(20161123555025)(20161123562025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR06MB2808; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR06MB2808; X-Forefront-PRVS: 04772EA191 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(376002)(346002)(39830400002)(189002)(199003)(97736004)(53936002)(478600001)(86362001)(575784001)(76176999)(101416001)(50466002)(50986999)(48376002)(69596002)(1076002)(25786009)(66066001)(81166006)(106356001)(8676002)(33646002)(105586002)(6116002)(3846002)(4326008)(36756003)(81156014)(2906002)(189998001)(8936002)(55016002)(68736007)(50226002)(2950100002)(16526018)(21086003)(305945005)(5660300001)(16586007)(47776003)(316002)(6666003)(54906003)(5003940100001)(7736002)(8656006); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR06MB2808; H:impinj.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: impinj.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR06MB2808; 23:jFR9PSOllv3fPP21NIS5Flma9rtwHaelB5gPMWbUP?= =?us-ascii?Q?XK2/VmWYPszAx7pWsWEv8oSzGrrIovdgQNR7jDV6fF35UAYq5Igusgtcqq7o?= =?us-ascii?Q?TsffCEcnSOaJ/GhsrpBK58xN1wB29WOFPHb1JFOHMpoGdSl+69A59G34fQAx?= =?us-ascii?Q?+FDwlPCI8wlRpzupqKZaRQ4TydlFCoTxLd1PSI6wLY+aWolxCONp4ZR+dKRd?= =?us-ascii?Q?/OAJsXd5MJvjOUOpntlxmsGF4BiyI2WVq0Uzlz4qFo50fXzzx3FuqqxlS3kB?= =?us-ascii?Q?Hitz1/i5OTlr7zu/d8i2XHSsgh47C9U30dVQDdjGrNvV/fYLD20cLOXf+6mS?= =?us-ascii?Q?Z2BOtuGFR7jRiugUpqGV5pw6TSpm5sEbkjpEncStkmQgxbATWY6YdPqLJesc?= =?us-ascii?Q?wQwG5XgpqQOcWb+iV4H917prqKl1+U96xJD0yxEm16jHC8o3kvma7hvhQYxB?= =?us-ascii?Q?/0WDCgLiKcYSQXrOLJSZTSqzQfRFZt6AO9wnFJbteQ90iE3Zy7t4Bi4f0+Pk?= =?us-ascii?Q?08BxqYmNPOn5/fGuEB9N6RmDd9igaAl/y+vKTpDDSPA7GwZDh3QfOqTSkIw8?= =?us-ascii?Q?Np3o/09rbR49UbvdmDXVrfEl8nLVdmsnFqmLBuPffrqeb/BHha1U2pDPSbSw?= =?us-ascii?Q?NKSIL3NHhNeblYr9rxEN2FOGn0HbhZctz0ZW7/TgQcj3tSo/EDFjjYAFRMLO?= =?us-ascii?Q?LX39BxfEe1lr3b8HAdx1/6oQlURCFtSvd1PSK1xGaLSd5bDjAYq+tb9so914?= =?us-ascii?Q?SVEJ1d2FDgvwjVA4imjHCefFrGShAqNwA+m4gBV0gmQ9ooNglo6j7ncLA6VA?= =?us-ascii?Q?hvqJhzY1qIR8Vi5WTkyaEfGX1iKghG2vxpt1zpFq4/YKsyQ9YdwKb44dDOg/?= =?us-ascii?Q?M6/UOs8TsUEHI1EJV5LpzJOhh1u7qr4OudNsmkCGgXHCBsOE5U4WTbgZgi62?= =?us-ascii?Q?NwNqWRQVMIzqhhmGhJhLkAojFZeUhF9N4WNy1DF4+aNaZ3dQOensDrxMX9SS?= =?us-ascii?Q?uvYcRz5KQH7IzfhgG9TQQXRyRCpcP8T3zyp0Qzb9lNlpgVOHrc1ybVeArSHg?= =?us-ascii?Q?5Wuazc/OXyBAemuW7rWJD9KrIcAEHhbTITEYq56GV9/1TV6tnBPwD5AYEzXE?= =?us-ascii?Q?K/l0dsAdHiKeT8RwuBaRxi05ySre9D9LQfHqxtGZfr+beqRA4G+uw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2808; 6:9cK2D1D+TBw5mFXsjVCujam/CeOy46k4j/fIb6zw7PiUlgwkkROR0UQIB6Sj6ngmG6P3QDGP8d1PoHXAw96OP5/mK76Pt1PC9uZxJXIQzDkIXM1GllsWfvYmDXdg43rRApUUmbsqoeVLM409R4zmYpAjt4CULZVA2jA3bX/zWqLThfJS0FcfEI1tz2pJu1eGNI5k67rDp4iRgXfWJ4l6JthM/sKBkUDMW6JXT8eIBUbZqvcgWK2xEsyIc4odbk34gkiR+VB0AxiOYcYhSCjVBFa0vgChgMZHVZqphi6bYVmhZ49b3KchYC3ckTGw2XuGBoYd6l6HLN7auGXjBt3f7dapRBjY6IXk1dCvCOjfGEE=; 5:TKDHcNPE1592lgwSekKlTco3y8ZsW8J8L+vI4q/3rN45GHrQNx+kiEsvNmSh6FyBP0UyyrJJvWwy/NlPZ1fUM8xNPrfnpWiC8SjURwKM45/DrzH9yaHNFHaRql4wJBBVidYXek8bVyRbxmP244Pi1Ut6Bwtu7bFhwJ2YDd6H8h4=; 24:PYX4sC0WskJ3tIVOogEQwHyopSkh9Y6SNvxPbXI30vN5Ts1XxkHL2rlGP+rWeRUHE28oAC1urFaY4ygqR0Be6i2pfDiv0vsfQNGEH14+g2o=; 7:FORD5esTFBdFJyP99ssLEipCJXc1MfYjSl+bexZHKHA0yTS9lg7/xMPrYBi1lTdtMHJyo9QKaBl/yHUTSrkKP9f7g9E9a5yapgoul1lfdneo8hY7T9YPQIlMXQzoTiIyiZ2/KcUliDer6Kda0eUw762XPveUxBaZqIbsbY+38JKESeFTFv+l2+6BOTqADDHMqLZwoVuSjIN8ApvNVIpKNYxoCLNFHJvrrQ7zHPEGsWuJUTqQKSNwY0WXMl53rDJ1 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: impinj.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2017 19:49:32.7256 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 18853cd1-4713-496d-7d4f-08d52098821d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 6de70f0f-7357-4529-a415-d8cbb7e93e5e X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR06MB2808 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the code that requests any chip select GPIOs fails, the cleanup of spi_bitbang_start() by calling spi_bitbang_stop() is not done. Add this to the failure path. Note that spi_bitbang_start() has to be called before requesting GPIOs because the GPIO data in the spi master is populated when the master is registed, and that doesn't happen until spi_bitbang_start() is called. CC: Shawn Guo CC: Sascha Hauer CC: Fabio Estevam CC: Mark Brown CC: Oleksij Rempel Signed-off-by: Trent Piepho --- drivers/spi/spi-imx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index 76bf0e4fc2c7..ad54f8258513 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -1638,7 +1638,7 @@ static int spi_imx_probe(struct platform_device *pdev) if (ret) { dev_err(&pdev->dev, "Can't get CS GPIO %i\n", master->cs_gpios[i]); - goto out_clk_put; + goto out_spi_bitbang; } } } @@ -1649,6 +1649,8 @@ static int spi_imx_probe(struct platform_device *pdev) clk_disable(spi_imx->clk_per); return ret; +out_spi_bitbang: + spi_bitbang_stop(&spi_imx->bitbang); out_clk_put: clk_disable_unprepare(spi_imx->clk_ipg); out_put_per: