renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-02 10:43:57 +08:00
Code

drivers/dma/dma-jz4780: Fix race condition between probe and irq handler

Browse Source 
In probe, IRQ is requested before zchan->id is initialized which can be
read in the irq handler. Hence, shift request irq after other initializations
complete.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Madhuparna Bhowmik <madhuparnabhowmik10@gmail.com>
Reviewed-by: Paul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20200821034423.12713-1-madhuparnabhowmik10@gmail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Madhuparna Bhowmik 2020-08-21 09:14:23 +05:30 committed by Vinod Koul
parent 05655541c9
commit 6d6018fc30
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/dma/dma-jz4780.c
View File

@ -879,24 +879,11 @@ static int jz4780_dma_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
ret = platform_get_irq(pdev, 0);
if (ret < 0)
return ret;
jzdma->irq = ret;
ret = request_irq(jzdma->irq, jz4780_dma_irq_handler, 0, dev_name(dev),
jzdma);
if (ret) {
dev_err(dev, "failed to request IRQ %u!\n", jzdma->irq);
return ret;
}
jzdma->clk = devm_clk_get(dev, NULL); jzdma->clk = devm_clk_get(dev, NULL);
if (IS_ERR(jzdma->clk)) { if (IS_ERR(jzdma->clk)) {
dev_err(dev, "failed to get clock\n"); dev_err(dev, "failed to get clock\n");
ret = PTR_ERR(jzdma->clk); ret = PTR_ERR(jzdma->clk);
goto err_free_irq; return ret;
} }
clk_prepare_enable(jzdma->clk); clk_prepare_enable(jzdma->clk);
@ -949,10 +936,23 @@ static int jz4780_dma_probe(struct platform_device *pdev)
jzchan->vchan.desc_free = jz4780_dma_desc_free; jzchan->vchan.desc_free = jz4780_dma_desc_free;
} }
ret = platform_get_irq(pdev, 0);
if (ret < 0)
goto err_disable_clk;
jzdma->irq = ret;
ret = request_irq(jzdma->irq, jz4780_dma_irq_handler, 0, dev_name(dev),
jzdma);
if (ret) {
dev_err(dev, "failed to request IRQ %u!\n", jzdma->irq);
goto err_disable_clk;
}
ret = dmaenginem_async_device_register(dd); ret = dmaenginem_async_device_register(dd);
if (ret) { if (ret) {
dev_err(dev, "failed to register device\n"); dev_err(dev, "failed to register device\n");
goto err_disable_clk; goto err_free_irq;
} }
/* Register with OF DMA helpers. */ /* Register with OF DMA helpers. */
@ -960,17 +960,17 @@ static int jz4780_dma_probe(struct platform_device *pdev)
jzdma); jzdma);
if (ret) { if (ret) {
dev_err(dev, "failed to register OF DMA controller\n"); dev_err(dev, "failed to register OF DMA controller\n");
goto err_disable_clk; goto err_free_irq;
} }
dev_info(dev, "JZ4780 DMA controller initialised\n"); dev_info(dev, "JZ4780 DMA controller initialised\n");
return 0; return 0;
err_disable_clk:
clk_disable_unprepare(jzdma->clk);
err_free_irq: err_free_irq:
free_irq(jzdma->irq, jzdma); free_irq(jzdma->irq, jzdma);
err_disable_clk:
clk_disable_unprepare(jzdma->clk);
return ret; return ret;
} }