From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D0A9C3A59C for ; Fri, 16 Aug 2019 07:34:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD56020644 for ; Fri, 16 Aug 2019 07:34:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726609AbfHPHel convert rfc822-to-8bit (ORCPT ); Fri, 16 Aug 2019 03:34:41 -0400 Received: from ajax.cs.uga.edu ([128.192.4.6]:37590 "EHLO ajax.cs.uga.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726482AbfHPHel (ORCPT ); Fri, 16 Aug 2019 03:34:41 -0400 X-Greylist: delayed 2912 seconds by postgrey-1.27 at vger.kernel.org; Fri, 16 Aug 2019 03:34:40 EDT Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) (authenticated bits=0) by ajax.cs.uga.edu (8.14.4/8.14.4) with ESMTP id x7G6k6pN009281 (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 16 Aug 2019 02:46:08 -0400 Received: by mail-lj1-f176.google.com with SMTP id z17so4399867ljz.0; Thu, 15 Aug 2019 23:46:07 -0700 (PDT) X-Gm-Message-State: APjAAAXU+xsv5iWCf0J6nXJxyWFJqG9P2pMuefQplCDajAN3QI5JxbMj KirCYl7CcIVicVOaC2DpuCInZAvQ7wU1MF4tojg= X-Google-Smtp-Source: APXvYqwVudRRgcmnjQiJ+5E7lLs9w4XgPnuG0DOW6TnvkX82j7Yeh0LM/NVK+iIi6fGbne/N8pYFf6O27SBOoihgRbA= X-Received: by 2002:a2e:7c12:: with SMTP id x18mr4759455ljc.100.1565937966576; Thu, 15 Aug 2019 23:46:06 -0700 (PDT) MIME-Version: 1.0 References: <1565936603-7046-1-git-send-email-wenwen@cs.uga.edu> In-Reply-To: From: Wenwen Wang Date: Fri, 16 Aug 2019 02:45:29 -0400 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH] dmaengine: ti: Fix a memory leak bug To: Peter Ujfalusi Cc: Dan Williams , Vinod Koul , Enrico Weigelt , Greg Kroah-Hartman , Thomas Gleixner , Kate Stewart , "open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM" , open list , Wenwen Wang Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org On Fri, Aug 16, 2019 at 2:42 AM Peter Ujfalusi wrote: > > > > On 16/08/2019 9.23, Wenwen Wang wrote: > > In ti_dra7_xbar_probe(), 'rsv_events' is allocated through kcalloc(). Then > > of_property_read_u32_array() is invoked to search for the property. > > However, if this process fails, 'rsv_events' is not deallocated, leading to > > a memory leak bug. To fix this issue, free 'rsv_events' before returning > > the error. > > Can you change the subject to: > "dmaengine: ti: dma-crossbar: Fix a memory leak bug" ? No problem. I will rework the patch. Thanks for your suggestion! Wenwen > > Otherwise: Thank you, and > Acked-by: Peter Ujfalusi > > > > > Signed-off-by: Wenwen Wang > > --- > > drivers/dma/ti/dma-crossbar.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/dma/ti/dma-crossbar.c b/drivers/dma/ti/dma-crossbar.c > > index ad2f0a4..f255056 100644 > > --- a/drivers/dma/ti/dma-crossbar.c > > +++ b/drivers/dma/ti/dma-crossbar.c > > @@ -391,8 +391,10 @@ static int ti_dra7_xbar_probe(struct platform_device *pdev) > > > > ret = of_property_read_u32_array(node, pname, (u32 *)rsv_events, > > nelm * 2); > > - if (ret) > > + if (ret) { > > + kfree(rsv_events); > > return ret; > > + } > > > > for (i = 0; i < nelm; i++) { > > ti_dra7_xbar_reserve(rsv_events[i][0], rsv_events[i][1], > > > > - Péter > > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. > Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki