Re: [PATCH 2/5] dmaengine: omap-dma: Fix memory leak when terminating running transfer

[Vinod Koul]

On Fri, Mar 27, 2015 at 01:35:52PM +0200, Peter Ujfalusi wrote:
> In omap_dma_start_desc the vdesc->node is removed from the virt-dma
> framework managed lists (to be precise from the desc_issued list).
> If a terminate_all comes before the transfer finishes the omap_desc will
> not be freed up because it is not in any of the lists and we stopped the
> DMA channel so the transfer will not going to complete.
> There is no special sequence for leaking memory when using cyclic (audio)
> transfer: with every start and stop of a cyclic transfer the driver leaks
> struct omap_desc worth of memory.
> 
> Free up the allocated memory directly in omap_dma_terminate_all() since the
> framework will not going to do that for us.
> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxx>
> CC: <stable@xxxxxxxxxxxxxxx>
> CC: <linux-omap@xxxxxxxxxxxxxxx>
Applied, thanks

-- 
~Vinod

> ---
>  drivers/dma/omap-dma.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
> index 1e646d6c8230..6a4c378ee432 100644
> --- a/drivers/dma/omap-dma.c
> +++ b/drivers/dma/omap-dma.c
> @@ -1002,6 +1002,7 @@ static int omap_dma_terminate_all(struct dma_chan *chan)
>  	 * c->desc is NULL and exit.)
>  	 */
>  	if (c->desc) {
> +		omap_dma_desc_free(&c->desc->vd);
>  		c->desc = NULL;
>  		/* Avoid stopping the dma twice */
>  		if (!c->paused)
> -- 
> 2.3.3
> 

-- 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/