From: Navid Emamdoost <navid.emamdoost@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: emamd001@umn.edu, smccaman@umn.edu, kjlu@umn.edu,
Navid Emamdoost <navid.emamdoost@gmail.com>,
Mark Brown <broonie@kernel.org>,
linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2] spi: gpio: prevent memory leak in spi_gpio_probe
Date: Mon, 30 Sep 2019 15:52:40 -0500 [thread overview]
Message-ID: <20190930205241.5483-1-navid.emamdoost@gmail.com> (raw)
In-Reply-To: <dcd26f62-e384-bf6d-2e7d-63c0d0f7da11@web.de>
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 <navid.emamdoost@gmail.com>
---
Changes in v2:
-- fix a typo in title and update the description
---
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 1d3e23ec20a6..f9c5bbb74714 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.17.1
next prev parent reply other threads:[~2019-09-30 20:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-30 3:39 [PATCH] spi: gpio: prevent memroy leak in spi_gpio_probe Navid Emamdoost
2019-09-30 6:24 ` [PATCH] spi: gpio: prevent memory " Markus Elfring
2019-09-30 20:52 ` Navid Emamdoost [this message]
2019-10-01 9:11 ` [PATCH v2] " Markus Elfring
2019-10-01 17:32 ` Navid Emamdoost
2019-10-02 5:07 ` [v2] " Markus Elfring
2019-10-01 17:57 ` Applied "spi: gpio: prevent memory leak in spi_gpio_probe" to the spi tree Mark Brown
2019-09-30 20:54 ` [PATCH] spi: gpio: prevent memory leak in spi_gpio_probe Navid Emamdoost
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=20190930205241.5483-1-navid.emamdoost@gmail.com \
--to=navid.emamdoost@gmail.com \
--cc=broonie@kernel.org \
--cc=emamd001@umn.edu \
--cc=kjlu@umn.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=smccaman@umn.edu \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).