diff options
| author | Petr Kulhavy <petr@barix.com> | 2015-03-27 14:35:51 +0300 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-04-25 00:13:53 +0300 |
| commit | ba1d2d92c3dae111c25824f0f44405df455c9e4f (patch) | |
| tree | 48791181d64c49248d6b9ad60f1e8ee3340f9d87 /drivers/dma | |
| parent | cfb769a843e50fd6d930a6655cdf2afd9bc0b0ab (diff) | |
| download | linux-ba1d2d92c3dae111c25824f0f44405df455c9e4f.tar.xz | |
dmaengine: edma: fix memory leak when terminating running transfers
[ Upstream commit 5ca9e7ce6eebec53362ff779264143860ccf68cd ]
If edma_terminate_all() was called while a transfer was running (i.e. after
edma_execute() but before edma_callback()) the echan->edesc was not freed.
This was due to the fact that a running transfer is on none of the
vchan lists: desc_submitted, desc_issued, desc_completed (edma_execute()
removes it from the desc_issued list), so the vchan_dma_desc_free_list()
called at the end of edma_terminate_all() didn't find it and didn't free it.
This bug was found on an AM1808 based hardware (very similar to da850evm,
however using the second MMC/SD controller), where intense operations on the SD
card wasted the device 128MB RAM within a couple of days.
Peter Ujfalusi:
The issue is even more severe since it affects cyclic (audio) transfers as
well. In this case starting/stopping audio will results memory leak.
Signed-off-by: Petr Kulhavy <petr@barix.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
CC: <stable@vger.kernel.org>
CC: <linux-omap@vger.kernel.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/edma.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 4cfaaa5a49be..abff66c18432 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -258,6 +258,13 @@ static int edma_terminate_all(struct edma_chan *echan) */ if (echan->edesc) { int cyclic = echan->edesc->cyclic; + + /* + * free the running request descriptor + * since it is not in any of the vdesc lists + */ + edma_desc_free(&echan->edesc->vdesc); + echan->edesc = NULL; edma_stop(echan->ch_num); /* Move the cyclic channel back to default queue */ |