Skip to content

Commit

Permalink
spi: cadence-qspi: fix pointer reference in runtime PM hooks
Browse files Browse the repository at this point in the history
[ Upstream commit 32ce3bb ]

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: 2087e85 ("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>
Link: https://msgid.link/r/20240222-cdns-qspi-pm-fix-v4-1-6b6af8bcbf59@bootlin.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
tleb authored and gregkh committed Mar 6, 2024
1 parent a9dfbc6 commit 34e1d5c
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/spi/spi-cadence-quadspi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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,
Expand Down

0 comments on commit 34e1d5c

Please sign in to comment.