From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751807AbbEGQ0b (ORCPT ); Thu, 7 May 2015 12:26:31 -0400 Received: from mga11.intel.com ([192.55.52.93]:11289 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751279AbbEGQ01 (ORCPT ); Thu, 7 May 2015 12:26:27 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,384,1427785200"; d="scan'208";a="490651130" Message-ID: <1431015968.28073.15.camel@linux.intel.com> Subject: Re: [PATCH 4/5] dmaengine: hsu: Fix memory leak when stopping a running transfer From: Andy Shevchenko To: Peter Ujfalusi Cc: vinod.koul@intel.com, linux@arm.linux.org.uk, dan.j.williams@intel.com, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Date: Thu, 07 May 2015 19:26:08 +0300 In-Reply-To: <1427456155-28990-5-git-send-email-peter.ujfalusi@ti.com> References: <1427456155-28990-1-git-send-email-peter.ujfalusi@ti.com> <1427456155-28990-5-git-send-email-peter.ujfalusi@ti.com> Organization: Intel Finland Oy Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.12.9-1+b1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. > > Signed-off-by: Peter Ujfalusi > CC: Andy Shevchenko > --- > 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); By the way, it should be 'vdesc);' at the end. > + hsuc->desc = NULL; > + } > > vchan_get_all_descriptors(&hsuc->vchan, &head); > spin_unlock_irqrestore(&hsuc->vchan.lock, flags); -- Andy Shevchenko Intel Finland Oy