Skip to contentSkip to conversation

Patch "dmaengine: omap-dma: Fix memory leak when terminating running transfer" has been added to the 3.10-stable tree

PATCH [email protected] 1 participant 1 message Apr 17, 2015 dmaengine

lore
Share & tools
lore

[email protected]

author Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

dmaengine: omap-dma: Fix memory leak when terminating running transfer

to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
dmaengine-omap-dma-fix-memory-leak-when-terminating-running-transfer.patch
and it can be found in the queue-3.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 02d88b735f5a60f04dbf6d051b76e1877a0d0844 Mon Sep 17 00:00:00 2001

From: Peter Ujfalusi <[email protected]>
Date: Fri, 27 Mar 2015 13:35:52 +0200
Subject: dmaengine: omap-dma: Fix memory leak when terminating running transfer

From: Peter Ujfalusi <[email protected]>

commit 02d88b735f5a60f04dbf6d051b76e1877a0d0844 upstream.

In omap_dma_start_desc the vdesc->node is removed from the virt-dma framework managed lists (to be precise from the desc_issued list). If a terminate_all comes before the transfer finishes the omap_desc will not be freed up because it is not in any of the lists and we stopped the DMA channel so the transfer will not going to complete.
There is no special sequence for leaking memory when using cyclic (audio)
transfer: with every start and stop of a cyclic transfer the driver leaks struct omap_desc worth of memory.

Free up the allocated memory directly in omap_dma_terminate_all() since the framework will not going to do that for us.

---
 drivers/dma/omap-dma.c |    1 +
 1 file changed, 1 insertion(+)
drivers/dma/omap-dma.c +1 -0
@@ -487,6 +487,7 @@ static int omap_dma_terminate_all(struct
 	 * c->desc is NULL and exit.)
 	 */
 	if (c->desc) {
+		omap_dma_desc_free(&c->desc->vd);
 		c->desc = NULL;
 		/* Avoid stopping the dma twice */
 		if (!c->paused)

Patches currently in stable-queue which might be from [email protected] are

queue-3.10/dmaengine-omap-dma-fix-memory-leak-when-terminating-running-transfer.patch