[Linux-stm32] spi: stm32-qspi: Update spi registering

Lukas Wunner lukas at wunner.de
Sat Jan 8 19:48:19 UTC 2022


On Thu, Jan 06, 2022 at 02:20:52PM +0100, patrice.chotard at foss.st.com wrote:
> --- a/drivers/spi/spi-stm32-qspi.c
> +++ b/drivers/spi/spi-stm32-qspi.c
> @@ -784,7 +784,7 @@ static int stm32_qspi_probe(struct platform_device *pdev)
>  	pm_runtime_enable(dev);
>  	pm_runtime_get_noresume(dev);
>  
> -	ret = devm_spi_register_master(dev, ctrl);
> +	ret = spi_register_master(ctrl);
>  	if (ret)
>  		goto err_pm_runtime_free;
>  
> @@ -817,6 +817,7 @@ static int stm32_qspi_remove(struct platform_device *pdev)
>  	struct stm32_qspi *qspi = platform_get_drvdata(pdev);
>  
>  	pm_runtime_get_sync(qspi->dev);
> +	spi_unregister_master(qspi->ctrl);
>  	/* disable qspi */
>  	writel_relaxed(0, qspi->io_base + QSPI_CR);
>  	stm32_qspi_dma_free(qspi);

NAK, this introduces a use-after-free because the "qspi" allocation
is freed by spi_unregister_master(), yet is subsequently accessed.

You need to convert the driver to devm_spi_alloc_master() to avoid that.
Do it in the same patch to ease backporting.

Please add a stable designation and a Fixes: tag.  Chances are the patch
needs to be backported all the way back to the release when the driver
was first introduced.

Thanks,

Lukas



More information about the Linux-stm32 mailing list