diff options
author | Petr Kulhavy <petr@barix.com> | 2015-03-27 13:35:51 +0200 |
---|---|---|
committer | Luis Henriques <luis.henriques@canonical.com> | 2015-04-13 16:48:58 +0100 |
commit | 14a39537780a5a78fd5ca7f5866b1aaf27223437 (patch) | |
tree | 165ca0a40c2364ccd93ab253e02a1bf70cd8165f /drivers/dma | |
parent | 3744e086627202094b92498af9ea1b1f43d57d8a (diff) | |
download | linux-stable-14a39537780a5a78fd5ca7f5866b1aaf27223437.tar.gz linux-stable-14a39537780a5a78fd5ca7f5866b1aaf27223437.tar.bz2 linux-stable-14a39537780a5a78fd5ca7f5866b1aaf27223437.zip |
dmaengine: edma: fix memory leak when terminating running transfers
commit 5ca9e7ce6eebec53362ff779264143860ccf68cd upstream.
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: <linux-omap@vger.kernel.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/edma.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index d08c4dedef35..3c58df963e06 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -256,6 +256,12 @@ static int edma_terminate_all(struct edma_chan *echan) * echan->edesc is NULL and exit.) */ if (echan->edesc) { + /* + * 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); } |