* [patch] dmaengine: edma: double free on error in edma_prep_slave_sg()
@ 2013-11-13 7:44 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2013-11-13 7:44 UTC (permalink / raw)
To: Dan Williams; +Cc: Vinod Koul, dmaengine, linux-kernel, kernel-janitors
We accidentally applied two correct but duplicative fixes for a memory
leak here:
4b6271a64463 ('dma: edma: Fix memory leak')
2f6d8fad0a16 ('dma: edma.c: remove edma_desc leakage')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index ea4abaa..9c8103d 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -420,7 +420,6 @@ 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");
kfree(edesc);
return NULL;
^ permalink raw reply related [flat|nested] 4+ messages in thread* [patch] dmaengine: edma: double free on error in edma_prep_slave_sg()
@ 2013-11-13 7:44 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2013-11-13 7:44 UTC (permalink / raw)
To: Dan Williams; +Cc: Vinod Koul, dmaengine, linux-kernel, kernel-janitors
We accidentally applied two correct but duplicative fixes for a memory
leak here:
4b6271a64463 ('dma: edma: Fix memory leak')
2f6d8fad0a16 ('dma: edma.c: remove edma_desc leakage')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index ea4abaa..9c8103d 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -420,7 +420,6 @@ 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");
kfree(edesc);
return NULL;
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [patch] dmaengine: edma: double free on error in edma_prep_slave_sg()
2013-11-13 7:44 ` Dan Carpenter
@ 2013-11-13 10:31 ` Vinod Koul
-1 siblings, 0 replies; 4+ messages in thread
From: Vinod Koul @ 2013-11-13 10:19 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Dan Williams, dmaengine, linux-kernel, kernel-janitors
On Wed, Nov 13, 2013 at 10:44:46AM +0300, Dan Carpenter wrote:
> We accidentally applied two correct but duplicative fixes for a memory
> leak here:
> 4b6271a64463 ('dma: edma: Fix memory leak')
> 2f6d8fad0a16 ('dma: edma.c: remove edma_desc leakage')
Thanks Dan,
I already send the same fix today morning. This was reported by Wing-Keung
sometime back
--
~Vinod
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
> index ea4abaa..9c8103d 100644
> --- a/drivers/dma/edma.c
> +++ b/drivers/dma/edma.c
> @@ -420,7 +420,6 @@ 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");
> kfree(edesc);
> return NULL;
> --
> To unsubscribe from this list: send the line "unsubscribe dmaengine" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [patch] dmaengine: edma: double free on error in edma_prep_slave_sg()
@ 2013-11-13 10:31 ` Vinod Koul
0 siblings, 0 replies; 4+ messages in thread
From: Vinod Koul @ 2013-11-13 10:31 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Dan Williams, dmaengine, linux-kernel, kernel-janitors
On Wed, Nov 13, 2013 at 10:44:46AM +0300, Dan Carpenter wrote:
> We accidentally applied two correct but duplicative fixes for a memory
> leak here:
> 4b6271a64463 ('dma: edma: Fix memory leak')
> 2f6d8fad0a16 ('dma: edma.c: remove edma_desc leakage')
Thanks Dan,
I already send the same fix today morning. This was reported by Wing-Keung
sometime back
--
~Vinod
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
> index ea4abaa..9c8103d 100644
> --- a/drivers/dma/edma.c
> +++ b/drivers/dma/edma.c
> @@ -420,7 +420,6 @@ 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");
> kfree(edesc);
> return NULL;
> --
> To unsubscribe from this list: send the line "unsubscribe dmaengine" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-11-13 11:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-13 7:44 [patch] dmaengine: edma: double free on error in edma_prep_slave_sg() Dan Carpenter
2013-11-13 7:44 ` Dan Carpenter
2013-11-13 10:19 ` Vinod Koul
2013-11-13 10:31 ` Vinod Koul
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.