Thread (17 messages) 17 messages, 5 authors, 2015-05-07

[PATCH 4/5] dmaengine: hsu: Fix memory leak when stopping a running transfer

From: andriy.shevchenko@linux.intel.com (Andy Shevchenko)
Date: 2015-03-27 12:02:20
Also in: linux-serial, lkml

On Fri, 2015-03-27 at 13:35 +0200, Peter Ujfalusi wrote:
The vd->node is removed from the lists when the transfer started so the
vchan_get_all_descriptors() will not find it. This results memory leak.
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Though this one would go via Greg's tty tree (Cc'ed) I think.
It becomes to regular work flow after 4.1-rc1.

Signed-off-by: Peter Ujfalusi <redacted>
CC: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
quoted hunk ↗ jump to hunk
---
 drivers/dma/hsu/hsu.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/dma/hsu/hsu.c b/drivers/dma/hsu/hsu.c
index 683ba9b62795..d1864bda008f 100644
--- a/drivers/dma/hsu/hsu.c
+++ b/drivers/dma/hsu/hsu.c
@@ -387,7 +387,10 @@ static int hsu_dma_terminate_all(struct dma_chan *chan)
 	spin_lock_irqsave(&hsuc->vchan.lock, flags);
 
 	hsu_dma_stop_channel(hsuc);
-	hsuc->desc = NULL;
+	if (hsuc->desc) {
+		hsu_dma_desc_free(&hsuc->desc->vchan);
+		hsuc->desc = NULL;
+	}
 
 	vchan_get_all_descriptors(&hsuc->vchan, &head);
 	spin_unlock_irqrestore(&hsuc->vchan.lock, flags);

-- 
Andy Shevchenko [off-list ref]
Intel Finland Oy
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help