summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorAntonio Borneo <borneo.antonio@gmail.com>2017-08-01 22:09:26 +0200
committerVinod Koul <vinod.koul@intel.com>2017-08-25 12:15:40 +0530
commit132b473cd594183dbd06a00bcee079477f6a7c9c (patch)
treebc4172153468c81a5e720ca9c709da93348e60f7 /drivers/dma
parent626c4e85a107a2dbf9b482371ada8fee39680ce2 (diff)
downloadlinux-stable-132b473cd594183dbd06a00bcee079477f6a7c9c.tar.gz
linux-stable-132b473cd594183dbd06a00bcee079477f6a7c9c.tar.bz2
linux-stable-132b473cd594183dbd06a00bcee079477f6a7c9c.zip
dmaengine: k3dma: fix double free of descriptor
Commit 36387a2b1f62b5c087c5fe6f0f7b23b94f722ad7 ("k3dma: Fix memory handling in preparation for cyclic mode") adds code to free the descriptor in ds_done. In cyclic mode, ds_done is never used and it's always NULL, so the added code is not executed. In non-cyclic mode, ds_done is used as a flag: when not NULL it signals that the descriptor has been consumed. No need to free it because it would be free by vchan_complete(). The fix takes back the code changed by the commit above: - remove the free on the descriptor; - initialize ds_done to NULL for the next run. Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/k3dma.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
index c00eb1244fcf..b76962363519 100644
--- a/drivers/dma/k3dma.c
+++ b/drivers/dma/k3dma.c
@@ -724,11 +724,7 @@ static int k3_dma_terminate_all(struct dma_chan *chan)
k3_dma_free_desc(&p->ds_run->vd);
p->ds_run = NULL;
}
- if (p->ds_done) {
- k3_dma_free_desc(&p->ds_done->vd);
- p->ds_done = NULL;
- }
-
+ p->ds_done = NULL;
}
spin_unlock_irqrestore(&c->vc.lock, flags);
vchan_dma_desc_free_list(&c->vc, &head);