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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 A0402C43603 for ; Tue, 10 Dec 2019 21:05:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A59824683 for ; Tue, 10 Dec 2019 21:05:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576011928; bh=Y2JRJHPlGVcW5GHbu2M7B2/vxdr5zJexIYc5v03m0Iw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CmCvMMMWb4Z++2cID13Qy+GUCuO2kDZvj+bb71pNd6KbGhth3199T0zS0gsC6YliU zr+Dj+MSqpyMcc4W+w9wgWP3It3N77ZpLDS1UMLwElzJ1tO2f8xSbgebzTDzG8lzhl o1yEOOc6VgDx5+kKtLXZ1tmdOHflS2MMXESkxvAg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727054AbfLJVFY (ORCPT ); Tue, 10 Dec 2019 16:05:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:49940 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727484AbfLJVEm (ORCPT ); Tue, 10 Dec 2019 16:04:42 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 81F4724681; Tue, 10 Dec 2019 21:04:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576011882; bh=Y2JRJHPlGVcW5GHbu2M7B2/vxdr5zJexIYc5v03m0Iw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MJPkRZAy2qCbrdqE740mWP/9FD2SXSD739cfs3MselFVl2WEBUTrJIRxuZCFrCqGE TVkRQQ9FdnW8X25YFid+EXWbbBaHvNJTpo6SAAWE94MR1Grg532dB82bO/qu9ZpbE7 Tj7f2HEMCeibzexHMYXG07ewsSbBxjit4rFVFcXM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Navid Emamdoost , Mark Brown , Sasha Levin , linux-spi@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 033/350] spi: gpio: prevent memory leak in spi_gpio_probe Date: Tue, 10 Dec 2019 15:58:45 -0500 Message-Id: <20191210210402.8367-33-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210210402.8367-1-sashal@kernel.org> References: <20191210210402.8367-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Navid Emamdoost [ Upstream commit d3b0ffa1d75d5305ebe34735598993afbb8a869d ] In spi_gpio_probe an SPI master is allocated via spi_alloc_master, but this controller should be released if devm_add_action_or_reset fails, otherwise memory leaks. In order to avoid leak spi_contriller_put must be called in case of failure for devm_add_action_or_reset. Fixes: 8b797490b4db ("spi: gpio: Make sure spi_master_put() is called in every error path") Signed-off-by: Navid Emamdoost Link: https://lore.kernel.org/r/20190930205241.5483-1-navid.emamdoost@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-gpio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c index 1d3e23ec20a61..f9c5bbb747142 100644 --- a/drivers/spi/spi-gpio.c +++ b/drivers/spi/spi-gpio.c @@ -371,8 +371,10 @@ static int spi_gpio_probe(struct platform_device *pdev) return -ENOMEM; status = devm_add_action_or_reset(&pdev->dev, spi_gpio_put, master); - if (status) + if (status) { + spi_master_put(master); return status; + } if (of_id) status = spi_gpio_probe_dt(pdev, master); -- 2.20.1