torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-22 07:27:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

spi: atcspi200: Fix double-free in atcspi_configure_dma()

Browse Source 
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: 34e3815ea4 ("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>
This commit is contained in:
Felix Gu
2026-03-05 20:22:38 +08:00
committed by Mark Brown
parent b20b437666
commit ad0e9ac2d5
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/spi/spi-atcspi200.c
View 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)