Messages in this thread Patch in this message |  | | From | Antonio Borneo <> | Subject | [PATCH v2 2/3] dmaengine: k3dma: fix double free of descriptor | Date | Tue, 1 Aug 2017 22:09:26 +0200 |
| |
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> --- To: dmaengine@vger.kernel.org To: Vinod Koul <vinod.koul@intel.com> To: Dan Williams <dan.j.williams@intel.com> Cc: linux-kernel@vger.kernel.org Cc: John Stultz <john.stultz@linaro.org> Cc: Zhangfei Gao <zhangfei.gao@linaro.org> --- drivers/dma/k3dma.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c index c00eb12..b769623 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); -- 1.9.1
|  |