From patchwork Thu Oct 24 16:50:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 3092921 Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 46D21BF924 for ; Thu, 24 Oct 2013 17:44:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 512D4204AF for ; Thu, 24 Oct 2013 17:44:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 397BC204A2 for ; Thu, 24 Oct 2013 17:44:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754844Ab3JXRow (ORCPT ); Thu, 24 Oct 2013 13:44:52 -0400 Received: from mga03.intel.com ([143.182.124.21]:11400 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754747Ab3JXRow (ORCPT ); Thu, 24 Oct 2013 13:44:52 -0400 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga101.ch.intel.com with ESMTP; 24 Oct 2013 10:44:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.93,535,1378882800"; d="scan'208";a="312295686" Received: from vkoul-udesk3.iind.intel.com ([10.223.84.41]) by AZSMGA002.ch.intel.com with ESMTP; 24 Oct 2013 10:44:47 -0700 Received: from vkoul-udesk3.iind.intel.com (localhost [127.0.0.1]) by vkoul-udesk3.iind.intel.com (8.14.3/8.14.3/Debian-9.1ubuntu1) with ESMTP id r9OGp1bc022072; Thu, 24 Oct 2013 22:21:05 +0530 Received: (from vkoul@localhost) by vkoul-udesk3.iind.intel.com (8.14.3/8.14.3/Submit) id r9OGot4b022067; Thu, 24 Oct 2013 22:20:55 +0530 X-Authentication-Warning: vkoul-udesk3.iind.intel.com: vkoul set sender to vinod.koul@intel.com using -f Date: Thu, 24 Oct 2013 22:20:55 +0530 From: Vinod Koul To: Valentin Ilie , Joel Fernandes , dma Cc: dan.j.williams@intel.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH] dma: edma: Fix memory leak Message-ID: <20131024165055.GB21230@intel.com> References: <1382620462-9799-1-git-send-email-valentin.ilie@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1382620462-9799-1-git-send-email-valentin.ilie@gmail.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, Oct 24, 2013 at 04:14:22PM +0300, Valentin Ilie wrote: > When it fails to allocate a slot, edesc should be free'd before return; > > Signed-off-by: Valentin Ilie > --- > drivers/dma/edma.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c > index 098a8da..79ebac6 100644 > --- a/drivers/dma/edma.c > +++ b/drivers/dma/edma.c > @@ -305,6 +305,7 @@ static struct dma_async_tx_descriptor *edma_prep_slave_sg( > edma_alloc_slot(EDMA_CTLR(echan->ch_num), > EDMA_SLOT_ANY); > if (echan->slot[i] < 0) { > + kfree(edesc); > dev_err(dev, "Failed to allocate slot\n"); > return NULL; > } Applied along with one more fix on the same line -><8-- From: Vinod Koul Date: Thu, 24 Oct 2013 22:17:50 +0530 Subject: [PATCH] dmaengine: edma: fix another memory leak commit 4b6271a6 fix a menory leak but one more existed in driver so fix that Signed-off-by: Vinod Koul --- drivers/dma/edma.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 134fa96..10b577f 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -347,6 +347,7 @@ static struct dma_async_tx_descriptor *edma_prep_slave_sg( ccnt = sg_dma_len(sg) / (acnt * bcnt); if (ccnt > (SZ_64K - 1)) { dev_err(dev, "Exceeded max SG segment size\n"); + kfree(edesc); return NULL; } cidx = acnt * bcnt;