Subject: [PATCH 4/5] dmaengine: hsu: Fix memory leak when stopping a running transfer

From: [email-masked] (Vinod Koul)
Date: Mon, 30 Mar 2015 23:07:32 +0530

On Fri, Mar 27, 2015 at 02:01:58PM +0200, Andy Shevchenko wrote:
> On Fri, 2015-03-27 at 13:35 +0200, Peter Ujfalusi wrote:
> > The vd->node is removed from the lists when the transfer started so the
> > vchan_get_all_descriptors() will not find it. This results memory leak.
> > 
> 
> Acked-by: Andy Shevchenko <[email-masked]>
Acked-by: Vinod Koul <[email-masked]>

Greg,

Please apply this in your queue for next

-- 
Vinod

> 
> Though this one would go via Greg's tty tree (Cc'ed) I think.
> It becomes to regular work flow after 4.1-rc1.
> 
> 
> > Signed-off-by: Peter Ujfalusi <[email-masked]>
> > CC: Andy Shevchenko <[email-masked]>
> 
> > ---
> >  drivers/dma/hsu/hsu.c | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/dma/hsu/hsu.c b/drivers/dma/hsu/hsu.c
> > index 683ba9b62795..d1864bda008f 100644
> > --- a/drivers/dma/hsu/hsu.c
> > +++ b/drivers/dma/hsu/hsu.c
> > @@ -387,7 +387,10 @@ static int hsu_dma_terminate_all(struct dma_chan *chan)
> >  	spin_lock_irqsave(&hsuc->vchan.lock, flags);
> >  
> >  	hsu_dma_stop_channel(hsuc);
> > -	hsuc->desc = NULL;
> > +	if (hsuc->desc) {
> > +		hsu_dma_desc_free(&hsuc->desc->vchan);
> > +		hsuc->desc = NULL;
> > +	}
> >  
> >  	vchan_get_all_descriptors(&hsuc->vchan, &head);
> >  	spin_unlock_irqrestore(&hsuc->vchan.lock, flags);
> 
> 
> -- 
> Andy Shevchenko <[email-masked]>
> Intel Finland Oy
> 

--