]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: atcspi200: Fix double-free in atcspi_configure_dma()
authorFelix Gu <ustc.gu@gmail.com>
Thu, 5 Mar 2026 12:22:38 +0000 (20:22 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 9 Mar 2026 12:29:30 +0000 (12:29 +0000)
The driver uses devm_dma_request_chan() which registers automatic cleanup
via devm_add_action_or_reset(). Calling dma_release_channel() manually on
the RX channel when TX channel request fails causes a double-free when
the devm cleanup runs.

Remove the unnecessary manual cleanup and simplify the error handling
since devm will properly release channels on probe failure or driver
detach.

Fixes: 34e3815ea459 ("spi: atcspi200: Add ATCSPI200 SPI controller driver")
Signed-off-by: Felix Gu <ustc.gu@gmail.com>
Link: https://patch.msgid.link/20260305-atcspi2000-v1-1-eafe08dcca60@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-atcspi200.c

index 60a37ff5c6f55fd501ea22d8ace19b8156d362f4..fef6954d27e1b6d244c95ea8c84b97701a7d4c73 100644 (file)
@@ -497,31 +497,17 @@ static int atcspi_init_resources(struct platform_device *pdev,
 
 static int atcspi_configure_dma(struct atcspi_dev *spi)
 {
-       struct dma_chan *dma_chan;
-       int ret = 0;
+       spi->host->dma_rx = devm_dma_request_chan(spi->dev, "rx");
+       if (IS_ERR(spi->host->dma_rx))
+               return PTR_ERR(spi->host->dma_rx);
 
-       dma_chan = devm_dma_request_chan(spi->dev, "rx");
-       if (IS_ERR(dma_chan)) {
-               ret = PTR_ERR(dma_chan);
-               goto err_exit;
-       }
-       spi->host->dma_rx = dma_chan;
+       spi->host->dma_tx = devm_dma_request_chan(spi->dev, "tx");
+       if (IS_ERR(spi->host->dma_tx))
+               return PTR_ERR(spi->host->dma_tx);
 
-       dma_chan = devm_dma_request_chan(spi->dev, "tx");
-       if (IS_ERR(dma_chan)) {
-               ret = PTR_ERR(dma_chan);
-               goto free_rx;
-       }
-       spi->host->dma_tx = dma_chan;
        init_completion(&spi->dma_completion);
 
-       return ret;
-
-free_rx:
-       dma_release_channel(spi->host->dma_rx);
-       spi->host->dma_rx = NULL;
-err_exit:
-       return ret;
+       return 0;
 }
 
 static int atcspi_enable_clk(struct atcspi_dev *spi)