| From a955c2377e5a1dd9b1acce2b7712d8f5b8ea55a0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 12 Dec 2020 17:06:14 +0100 |
| Subject: dmaengine: fsldma: Fix a resource leak in an error handling path of |
| the probe function |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| [ Upstream commit b202d4e82531a62a33a6b14d321dd2aad491578e ] |
| |
| In case of error, the previous 'fsl_dma_chan_probe()' calls must be undone |
| by some 'fsl_dma_chan_remove()', as already done in the remove function. |
| |
| It was added in the remove function in commit 77cd62e8082b ("fsldma: allow |
| Freescale Elo DMA driver to be compiled as a module") |
| |
| Fixes: d3f620b2c4fe ("fsldma: simplify IRQ probing and handling") |
| Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Link: https://lore.kernel.org/r/20201212160614.92576-1-christophe.jaillet@wanadoo.fr |
| Signed-off-by: Vinod Koul <vkoul@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/dma/fsldma.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c |
| index a5687864e8830..c9a1d59dcb490 100644 |
| --- a/drivers/dma/fsldma.c |
| +++ b/drivers/dma/fsldma.c |
| @@ -1331,6 +1331,7 @@ static int fsldma_of_probe(struct platform_device *op) |
| { |
| struct fsldma_device *fdev; |
| struct device_node *child; |
| + unsigned int i; |
| int err; |
| |
| fdev = kzalloc(sizeof(*fdev), GFP_KERNEL); |
| @@ -1411,6 +1412,10 @@ static int fsldma_of_probe(struct platform_device *op) |
| return 0; |
| |
| out_free_fdev: |
| + for (i = 0; i < FSL_DMA_MAX_CHANS_PER_DEVICE; i++) { |
| + if (fdev->chan[i]) |
| + fsl_dma_chan_remove(fdev->chan[i]); |
| + } |
| irq_dispose_mapping(fdev->irq); |
| iounmap(fdev->regs); |
| out_free: |
| -- |
| 2.27.0 |
| |