All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: linux-spi@vger.kernel.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>,
	Mark Brown <broonie@kernel.org>, Chris Healy <cphealy@gmail.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 10/12] spi: gpio: Make sure spi_master_put() is called in every error path
Date: Tue,  2 Apr 2019 21:01:31 -0700	[thread overview]
Message-ID: <20190403040133.1459-11-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190403040133.1459-1-andrew.smirnov@gmail.com>

There's a number of failure paths in spi_gpio_probe() that do not call
spi_master_put() potentially leaking memory. Fix this problem by
registering a cleanup funciont via devm_add_action_or_reset() right
after SPI controller is allocated.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Chris Healy <cphealy@gmail.com>
Cc: linux-spi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
 drivers/spi/spi-gpio.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index 3a6a9c6966c0..668f2cd82d98 100644
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -363,6 +363,11 @@ static int spi_gpio_probe_pdata(struct platform_device *pdev,
 	return 0;
 }
 
+static void spi_gpio_put(void *data)
+{
+	spi_master_put(data);
+}
+
 static int spi_gpio_probe(struct platform_device *pdev)
 {
 	int				status;
@@ -378,6 +383,10 @@ static int spi_gpio_probe(struct platform_device *pdev)
 	if (!master)
 		return -ENOMEM;
 
+	status = devm_add_action_or_reset(&pdev->dev, spi_gpio_put, master);
+	if (status)
+		return status;
+
 	if (of_id)
 		status = spi_gpio_probe_dt(pdev, master);
 	else
@@ -429,11 +438,7 @@ static int spi_gpio_probe(struct platform_device *pdev)
 	}
 	bb->setup_transfer = spi_bitbang_setup_transfer;
 
-	status = spi_bitbang_start(&spi_gpio->bitbang);
-	if (status)
-		spi_master_put(master);
-
-	return status;
+	return spi_bitbang_start(&spi_gpio->bitbang);
 }
 
 static int spi_gpio_remove(struct platform_device *pdev)
@@ -445,8 +450,6 @@ static int spi_gpio_remove(struct platform_device *pdev)
 	/* stop() unregisters child devices too */
 	spi_bitbang_stop(&spi_gpio->bitbang);
 
-	spi_master_put(spi_gpio->bitbang.master);
-
 	return 0;
 }
 
-- 
2.20.1


  parent reply	other threads:[~2019-04-03  4:02 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-03  4:01 [PATCH 00/12] SPI GPIO improvements Andrey Smirnov
2019-04-03  4:01 ` [PATCH 01/12] spi: gpio: Drop unused spi_to_pdata() Andrey Smirnov
2019-04-03  4:42   ` Applied "spi: gpio: Drop unused spi_to_pdata()" to the spi tree Mark Brown
2019-04-03  4:42     ` Mark Brown
2019-04-03  4:01 ` [PATCH 02/12] spi: gpio: Add local struct device pointer in spi_gpio_probe() Andrey Smirnov
2019-04-03  4:42   ` Applied "spi: gpio: Add local struct device pointer in spi_gpio_probe()" to the spi tree Mark Brown
2019-04-03  4:42     ` Mark Brown
2019-04-03  4:01 ` [PATCH 03/12] spi: gpio: Add local struct spi_bitbang pointer in spi_gpio_probe() Andrey Smirnov
2019-04-03  4:42   ` Applied "spi: gpio: Add local struct spi_bitbang pointer in spi_gpio_probe()" to the spi tree Mark Brown
2019-04-03  4:42     ` Mark Brown
2019-04-03  4:01 ` [PATCH 04/12] spi: gpio: Simplify SPI_MASTER_NO_TX check in spi_gpio_probe() Andrey Smirnov
2019-04-03  4:42   ` Applied "spi: gpio: Simplify SPI_MASTER_NO_TX check in spi_gpio_probe()" to the spi tree Mark Brown
2019-04-03  4:42     ` Mark Brown
2019-04-03  4:01 ` [PATCH 05/12] spi: gpio: Drop unused pdata copy in struct spi_gpio Andrey Smirnov
2019-04-03  4:42   ` Applied "spi: gpio: Drop unused pdata copy in struct spi_gpio" to the spi tree Mark Brown
2019-04-03  4:42     ` Mark Brown
2019-04-03  4:01 ` [PATCH 06/12] spi: gpio: Don't request CS GPIO in DT use-case Andrey Smirnov
2019-04-05  3:26   ` Applied "spi: gpio: Don't request CS GPIO in DT use-case" to the spi tree Mark Brown
2019-04-05  3:26     ` Mark Brown
2019-04-03  4:01 ` [PATCH 07/12] spi: Don't call spi_get_gpio_descs() before device name is set Andrey Smirnov
2019-04-05  3:26   ` Applied "spi: Don't call spi_get_gpio_descs() before device name is set" to the spi tree Mark Brown
2019-04-05  3:26     ` Mark Brown
2019-04-03  4:01 ` [PATCH 08/12] spi: gpio: Drop mflags argument from spi_gpio_request() Andrey Smirnov
2019-04-05  3:26   ` Applied "spi: gpio: Drop mflags argument from spi_gpio_request()" to the spi tree Mark Brown
2019-04-05  3:26     ` Mark Brown
2019-04-03  4:01 ` [PATCH 09/12] spi: gpio: Drop unused pdev field in struct spi_gpio Andrey Smirnov
2019-04-05  3:26   ` Applied "spi: gpio: Drop unused pdev field in struct spi_gpio" to the spi tree Mark Brown
2019-04-05  3:26     ` Mark Brown
2019-04-03  4:01 ` Andrey Smirnov [this message]
2019-04-08  7:32   ` Applied "spi: gpio: Make sure spi_master_put() is called in every error path" " Mark Brown
2019-04-08  7:32     ` Mark Brown
2019-04-03  4:01 ` [PATCH 11/12] spi: bitbang: Introduce spi_bitbang_init() Andrey Smirnov
2019-04-08  7:32   ` Applied "spi: bitbang: Introduce spi_bitbang_init()" to the spi tree Mark Brown
2019-04-08  7:32     ` Mark Brown
2019-04-03  4:01 ` [PATCH 12/12] spi: gpio: Use devm_spi_register_master() Andrey Smirnov
2019-04-08  7:32   ` Applied "spi: gpio: Use devm_spi_register_master()" to the spi tree Mark Brown
2019-04-08  7:32     ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190403040133.1459-11-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=broonie@kernel.org \
    --cc=cphealy@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-spi@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.