Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 132b473c authored by Antonio Borneo's avatar Antonio Borneo Committed by Vinod Koul
Browse files

dmaengine: k3dma: fix double free of descriptor 



Commit 36387a2b ("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: default avatarAntonio Borneo <borneo.antonio@gmail.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 626c4e85

drivers/dma/k3dma.c

+1 −5
Original line number Diff line number Diff line
@@ -724,12 +724,8 @@ 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;

	}



	}

	spin_unlock_irqrestore(&c->vc.lock, flags);

	vchan_dma_desc_free_list(&c->vc, &head);