spi: fsl-dspi: fix wrong pointer in suspend/resume (9bd77a9c) · Commits · 戴 / test

Since commit ("spi: fsl-dspi: fix use-after-free in remove path"), this driver causes a "NULL pointer dereference" in dspi_suspend/resume. This is because since this commit, the drivers private data point to "dspi" instead of "ctlr", the codes in suspend and resume func were not modified correspondly. Fixes: ("spi: fsl-dspi: fix use-after-free in remove path") Signed-off-by:

Zhao Qiang <qiang.zhao@nxp.com> Reviewed-by:

Vladimir Oltean <olteanv@gmail.com> Link: https://lore.kernel.org/r/20201103020546.1822-1-qiang.zhao@nxp.com Signed-off-by:

Mark Brown <broonie@kernel.org>

drivers/spi/spi-fsl-dspi.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -1080,12 +1080,11 @@ MODULE_DEVICE_TABLE(of, fsl_dspi_dt_ids);
		#ifdef CONFIG_PM_SLEEP
		static int dspi_suspend(struct device *dev)
		{
		struct spi_controller *ctlr = dev_get_drvdata(dev);
		struct fsl_dspi *dspi = spi_controller_get_devdata(ctlr);
		struct fsl_dspi *dspi = dev_get_drvdata(dev);

		if (dspi->irq)
		disable_irq(dspi->irq);
		spi_controller_suspend(ctlr);
		spi_controller_suspend(dspi->ctlr);
		clk_disable_unprepare(dspi->clk);

		pinctrl_pm_select_sleep_state(dev);
		@@ -1095,8 +1094,7 @@ static int dspi_suspend(struct device *dev)

		static int dspi_resume(struct device *dev)
		{
		struct spi_controller *ctlr = dev_get_drvdata(dev);
		struct fsl_dspi *dspi = spi_controller_get_devdata(ctlr);
		struct fsl_dspi *dspi = dev_get_drvdata(dev);
		int ret;

		pinctrl_pm_select_default_state(dev);
		@@ -1104,7 +1102,7 @@ static int dspi_resume(struct device *dev)
		ret = clk_prepare_enable(dspi->clk);
		if (ret)
		return ret;
		spi_controller_resume(ctlr);
		spi_controller_resume(dspi->ctlr);
		if (dspi->irq)
		enable_irq(dspi->irq);

Admin message