From: Lukas Wunner <lukas@wunner.de>
To: Mark Brown <broonie@kernel.org>
Cc: linux-spi@vger.kernel.org, Rajendra Nayak <rnayak@codeaurora.org>,
Girish Mahadevan <girishm@codeaurora.org>,
Douglas Anderson <dianders@chromium.org>
Subject: [PATCH for-5.10] spi: spi-geni-qcom: Fix use-after-free on unbind
Date: Mon, 16 Nov 2020 09:23:01 +0100 [thread overview]
Message-ID: <73adc6ba84a4f968f2e1499a776e5c928fbdde56.1605512876.git.lukas@wunner.de> (raw)
spi_geni_remove() accesses the driver's private data after calling
spi_unregister_master() even though that function releases the last
reference on the spi_master and thereby frees the private data.
Moreover, since commit 1a9e489e6128 ("spi: spi-geni-qcom: Use OPP API to
set clk/perf state"), spi_geni_probe() leaks the spi_master allocation
if the calls to dev_pm_opp_set_clkname() or dev_pm_opp_of_add_table()
fail.
Fix by switching over to the new devm_spi_alloc_master() helper which
keeps the private data accessible until the driver has unbound and also
avoids the spi_master leak on probe.
Fixes: 561de45f72bd ("spi: spi-geni-qcom: Add SPI driver support for GENI based QUP")
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Cc: <stable@vger.kernel.org> # v4.20+: 5e844cc37a5c: spi: Introduce device-managed SPI controller allocation
Cc: <stable@vger.kernel.org> # v4.20+
Cc: Rajendra Nayak <rnayak@codeaurora.org>
Cc: Girish Mahadevan <girishm@codeaurora.org>
---
drivers/spi/spi-geni-qcom.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c
index 25810a7eef10..0e3d8e6c08f4 100644
--- a/drivers/spi/spi-geni-qcom.c
+++ b/drivers/spi/spi-geni-qcom.c
@@ -603,7 +603,7 @@ static int spi_geni_probe(struct platform_device *pdev)
if (IS_ERR(clk))
return PTR_ERR(clk);
- spi = spi_alloc_master(dev, sizeof(*mas));
+ spi = devm_spi_alloc_master(dev, sizeof(*mas));
if (!spi)
return -ENOMEM;
@@ -673,7 +673,6 @@ static int spi_geni_probe(struct platform_device *pdev)
free_irq(mas->irq, spi);
spi_geni_probe_runtime_disable:
pm_runtime_disable(dev);
- spi_master_put(spi);
dev_pm_opp_of_remove_table(&pdev->dev);
put_clkname:
dev_pm_opp_put_clkname(mas->se.opp_table);
--
2.28.0
next reply other threads:[~2020-11-16 8:37 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-16 8:23 Lukas Wunner [this message]
2020-11-16 8:23 ` [PATCH for-5.10] spi: spi-qcom-qspi: Fix use-after-free on unbind Lukas Wunner
2020-11-16 8:23 ` [PATCH for-5.10] spi: spi-sh: " Lukas Wunner
2020-11-16 8:23 ` [PATCH for-5.10] spi: pxa2xx: " Lukas Wunner
2020-11-16 8:23 ` [PATCH for-5.10] spi: rpc-if: " Lukas Wunner
2020-11-28 20:20 ` Sergey Shtylyov
2020-11-29 11:35 ` Lukas Wunner
2020-11-30 19:18 ` Sergey Shtylyov
2020-12-02 11:43 ` Lukas Wunner
2020-11-16 8:23 ` [PATCH for-5.10] spi: mxic: Don't leak SPI master in probe error path Lukas Wunner
2020-11-16 8:23 ` [PATCH for-5.10] spi: mt7621: " Lukas Wunner
2020-11-16 11:05 ` Stefan Roese
2020-11-16 8:23 ` [PATCH for-5.10] spi: spi-mtk-nor: " Lukas Wunner
2020-11-17 4:02 ` Ikjoon Jang
2020-11-17 12:32 ` Mark Brown
2020-11-16 8:23 ` [PATCH for-5.10] spi: gpio: " Lukas Wunner
2020-11-16 19:23 ` Andrey Smirnov
2020-11-16 23:03 ` Lukas Wunner
2020-11-16 23:59 ` Andrey Smirnov
2020-11-18 1:08 ` Linus Walleij
2020-11-16 8:23 ` [PATCH for-5.10] spi: npcm-fiu: " Lukas Wunner
2020-11-17 22:38 ` Mark Brown
2020-12-01 13:57 ` Mark Brown
2020-12-01 14:30 ` Lukas Wunner
2020-12-01 17:17 ` Mark Brown
2020-12-01 17:49 ` Lukas Wunner
2020-12-02 15:17 ` Mark Brown
2020-11-16 8:23 ` [PATCH for-5.10] spi: rb4xx: " Lukas Wunner
2020-11-16 8:23 ` [PATCH for-5.10] spi: sc18is602: " Lukas Wunner
2020-11-16 8:23 ` [PATCH for-5.10] media: netup_unidvb: " Lukas Wunner
2020-11-23 14:06 ` Mauro Carvalho Chehab
2020-12-01 13:57 ` 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=73adc6ba84a4f968f2e1499a776e5c928fbdde56.1605512876.git.lukas@wunner.de \
--to=lukas@wunner.de \
--cc=broonie@kernel.org \
--cc=dianders@chromium.org \
--cc=girishm@codeaurora.org \
--cc=linux-spi@vger.kernel.org \
--cc=rnayak@codeaurora.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 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).