From: "Théo Lebrun" <theo.lebrun@bootlin.com>
To: Mark Brown <broonie@kernel.org>, Apurva Nandan <a-nandan@ti.com>,
Dhruva Gole <d-gole@ti.com>
Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org,
"Gregory CLEMENT" <gregory.clement@bootlin.com>,
"Vladimir Kondratiev" <vladimir.kondratiev@mobileye.com>,
"Thomas Petazzoni" <thomas.petazzoni@bootlin.com>,
"Tawfik Bayouk" <tawfik.bayouk@mobileye.com>,
"Théo Lebrun" <theo.lebrun@bootlin.com>
Subject: [PATCH v4 1/4] spi: cadence-qspi: fix pointer reference in runtime PM hooks
Date: Thu, 22 Feb 2024 11:12:29 +0100 [thread overview]
Message-ID: <20240222-cdns-qspi-pm-fix-v4-1-6b6af8bcbf59@bootlin.com> (raw)
In-Reply-To: <20240222-cdns-qspi-pm-fix-v4-0-6b6af8bcbf59@bootlin.com>
dev_get_drvdata() gets used to acquire the pointer to cqspi and the SPI
controller. Neither embed the other; this lead to memory corruption.
On a given platform (Mobileye EyeQ5) the memory corruption is hidden
inside cqspi->f_pdata. Also, this uninitialised memory is used as a
mutex (ctlr->bus_lock_mutex) by spi_controller_suspend().
Fixes: 2087e85bb66e ("spi: cadence-quadspi: fix suspend-resume implementations")
Reviewed-by: Dhruva Gole <d-gole@ti.com>
Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com>
---
drivers/spi/spi-cadence-quadspi.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c
index 74647dfcb86c..d19ba024c80b 100644
--- a/drivers/spi/spi-cadence-quadspi.c
+++ b/drivers/spi/spi-cadence-quadspi.c
@@ -1930,10 +1930,9 @@ static void cqspi_remove(struct platform_device *pdev)
static int cqspi_suspend(struct device *dev)
{
struct cqspi_st *cqspi = dev_get_drvdata(dev);
- struct spi_controller *host = dev_get_drvdata(dev);
int ret;
- ret = spi_controller_suspend(host);
+ ret = spi_controller_suspend(cqspi->host);
cqspi_controller_enable(cqspi, 0);
clk_disable_unprepare(cqspi->clk);
@@ -1944,7 +1943,6 @@ static int cqspi_suspend(struct device *dev)
static int cqspi_resume(struct device *dev)
{
struct cqspi_st *cqspi = dev_get_drvdata(dev);
- struct spi_controller *host = dev_get_drvdata(dev);
clk_prepare_enable(cqspi->clk);
cqspi_wait_idle(cqspi);
@@ -1953,7 +1951,7 @@ static int cqspi_resume(struct device *dev)
cqspi->current_cs = -1;
cqspi->sclk = 0;
- return spi_controller_resume(host);
+ return spi_controller_resume(cqspi->host);
}
static DEFINE_RUNTIME_DEV_PM_OPS(cqspi_dev_pm_ops, cqspi_suspend,
--
2.43.2
next prev parent reply other threads:[~2024-02-22 10:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-22 10:12 [PATCH v4 0/4] spi: cadence-qspi: Fix runtime PM and system-wide suspend Théo Lebrun
2024-02-22 10:12 ` Théo Lebrun [this message]
2024-02-22 10:12 ` [PATCH v4 2/4] spi: cadence-qspi: remove system-wide suspend helper calls from runtime PM hooks Théo Lebrun
2024-02-22 10:12 ` [PATCH v4 3/4] spi: cadence-qspi: put runtime in runtime PM hooks names Théo Lebrun
2024-02-22 10:22 ` Dhruva Gole
2024-02-22 10:12 ` [PATCH v4 4/4] spi: cadence-qspi: add system-wide suspend and resume callbacks Théo Lebrun
2024-02-22 19:13 ` [PATCH v4 0/4] spi: cadence-qspi: Fix runtime PM and system-wide suspend Mark Brown
2024-02-26 12:18 ` Dhruva Gole
2024-02-26 13:27 ` Mark Brown
2024-02-26 13:40 ` Mark Brown
2024-02-26 13:42 ` Théo Lebrun
2024-02-27 5:03 ` Dhruva Gole
2024-02-26 13:36 ` Théo Lebrun
2024-02-27 12:00 ` Dhruva Gole
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=20240222-cdns-qspi-pm-fix-v4-1-6b6af8bcbf59@bootlin.com \
--to=theo.lebrun@bootlin.com \
--cc=a-nandan@ti.com \
--cc=broonie@kernel.org \
--cc=d-gole@ti.com \
--cc=gregory.clement@bootlin.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=tawfik.bayouk@mobileye.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=vladimir.kondratiev@mobileye.com \
/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).