Skip to contentSkip to conversation

dmaengine: edma: double free on error in edma_prep_slave_sg()

PATCH In review Dan Carpenter 2 participants 2 messages Nov 13, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dmaengine: edma: double free on error in edma_prep_slave_sg()

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')

drivers/dma/edma.c +0 -1
index ea4abaa..9c8103d 100644
@@ -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;
#1 lore raw
Quoted 4 lines · Dan Carpenter

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

Quoted 19 lines
drivers/dma/edma.c +0 -2
index ea4abaa..9c8103d 100644
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html