diff options
author | Colin Ian King <colin.king@canonical.com> | 2016-09-29 13:45:05 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2016-09-30 13:52:26 -0400 |
commit | fc878efe84c342441706fcdf776e08fe455fe9c1 (patch) | |
tree | 659ea88f0bd11b6b6afea75c365eee1b422e6953 /drivers/dma/dma-jz4780.c | |
parent | 9f0df936b1b93a7fab5b9ed73009f43369c121ea (diff) |
dmaengine: jz4780: fix resource leaks on error exit return
In two cases when jz4780_dma_setup_hwdesc fails, there is a memory
leak on the allocated desc and associated DMA pools on the error
exit return path. Fix this by free'ing the resources before
returning.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/dma-jz4780.c')
-rw-r--r-- | drivers/dma/dma-jz4780.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c index dade7c47ff18..27e93368b62c 100644 --- a/drivers/dma/dma-jz4780.c +++ b/drivers/dma/dma-jz4780.c | |||
@@ -324,8 +324,10 @@ static struct dma_async_tx_descriptor *jz4780_dma_prep_slave_sg( | |||
324 | sg_dma_address(&sgl[i]), | 324 | sg_dma_address(&sgl[i]), |
325 | sg_dma_len(&sgl[i]), | 325 | sg_dma_len(&sgl[i]), |
326 | direction); | 326 | direction); |
327 | if (err < 0) | 327 | if (err < 0) { |
328 | jz4780_dma_desc_free(&jzchan->desc->vdesc); | ||
328 | return NULL; | 329 | return NULL; |
330 | } | ||
329 | 331 | ||
330 | desc->desc[i].dcm |= JZ_DMA_DCM_TIE; | 332 | desc->desc[i].dcm |= JZ_DMA_DCM_TIE; |
331 | 333 | ||
@@ -368,8 +370,10 @@ static struct dma_async_tx_descriptor *jz4780_dma_prep_dma_cyclic( | |||
368 | for (i = 0; i < periods; i++) { | 370 | for (i = 0; i < periods; i++) { |
369 | err = jz4780_dma_setup_hwdesc(jzchan, &desc->desc[i], buf_addr, | 371 | err = jz4780_dma_setup_hwdesc(jzchan, &desc->desc[i], buf_addr, |
370 | period_len, direction); | 372 | period_len, direction); |
371 | if (err < 0) | 373 | if (err < 0) { |
374 | jz4780_dma_desc_free(&jzchan->desc->vdesc); | ||
372 | return NULL; | 375 | return NULL; |
376 | } | ||
373 | 377 | ||
374 | buf_addr += period_len; | 378 | buf_addr += period_len; |
375 | 379 | ||