diff mbox

dma: edma: Fix memory leak

Message ID 20131024165055.GB21230@intel.com (mailing list archive)
State Accepted
Headers show

Commit Message

Vinod Koul Oct. 24, 2013, 4:50 p.m. UTC 
On Thu, Oct 24, 2013 at 04:14:22PM +0300, Valentin Ilie wrote:
> When it fails to allocate a slot, edesc should be free'd before return;
> 
> Signed-off-by: Valentin Ilie <valentin.ilie@gmail.com>
> ---
>  drivers/dma/edma.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
> index 098a8da..79ebac6 100644
> --- a/drivers/dma/edma.c
> +++ b/drivers/dma/edma.c
> @@ -305,6 +305,7 @@ static struct dma_async_tx_descriptor *edma_prep_slave_sg(
>  				edma_alloc_slot(EDMA_CTLR(echan->ch_num),
>  						EDMA_SLOT_ANY);
>  			if (echan->slot[i] < 0) {
> +				kfree(edesc);
>  				dev_err(dev, "Failed to allocate slot\n");
>  				return NULL;
>  			}
Applied along with one more fix on the same line

-><8--
From: Vinod Koul <vinod.koul@intel.com>
Date: Thu, 24 Oct 2013 22:17:50 +0530
Subject: [PATCH] dmaengine: edma: fix another memory leak

commit 4b6271a6 fix a menory leak but one more existed in driver so fix that

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 drivers/dma/edma.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
diff mbox

Patch

diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index 134fa96..10b577f 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -347,6 +347,7 @@  static struct dma_async_tx_descriptor *edma_prep_slave_sg(
 			ccnt = sg_dma_len(sg) / (acnt * bcnt);
 			if (ccnt > (SZ_64K - 1)) {
 				dev_err(dev, "Exceeded max SG segment size\n");
+				kfree(edesc);
 				return NULL;
 			}
 			cidx = acnt * bcnt;