Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp559223ybl; Thu, 15 Aug 2019 23:55:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqwQ+lnZ7fScCQtbs4UC10pslcUsp04HF2Y9HN7HDeQvwLGI9AhpRD6gq0ILzXI+kwS+/uCl X-Received: by 2002:a63:d852:: with SMTP id k18mr6528424pgj.313.1565938518217; Thu, 15 Aug 2019 23:55:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565938518; cv=none; d=google.com; s=arc-20160816; b=qi0BWuC6UOg3CCCoFkVtB1SpYiDLtxGVuSbYRitj6xQg+MhXdIpXN3Q7c0BcxkM74T 7KQTNyhPkS7RH6olALU5r5m3HFRqUbt3K1ZrLqzZlq/jYTVPisA/g8uFKrlYtiNQDAm0 BgYLtFM+7WVhliTq7M36hFR63cseSNHffS1g1cy3r3pndS7minCiP4CW3mwDEZuaVX0V DHXJuLipWmEXmlqCbYAr/BYNU35jdqJzLC6qZSGVW3FHGoVklAk7oU5kioyyf3aK0sQj NSKrZVNqLhTRYFuz5saWi5DQRriPmQsmso05+1oPLVA+K1akYZ9vkqgYNwAQnuNy9vdG ix8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature; bh=Gu7E7gqMococXfCNlEpS2YaEPFtnyWvUe/FmGZ/Bp7Q=; b=MrOFRnL8YKYnok7gtPFc9YdIrwO8tIrpb2BVdRpGFlR6nkDabJkSmDmMG8/pb0n/fk t4x7HWjYOC3Z9y4SkdJaK5F9sTH/rbzMFoXA/o999zRjvD0Xvvu0swBEroRhfs8O2kg4 bzUFbnMAPzLHxtymaDOJ2aU5PzPgLLBbiiDHcbZ5TNDBLcX1xYWkSC0oener66vuubvn mTr5rpVQpxyE1yoz7Gl6j56uXc+r3fqEfbMEiMUKuQPUHqwp9mLPiC1fsKjKfCnuRZh/ wyj2/Ypw49rJ/ojNa+/ZOiMUAwZmkc01de4Fno0FFZmxm/TCZd7V6Id2QaLwshTYrOuT gsCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=RkdODmGu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u9si3338870pgf.198.2019.08.15.23.55.02; Thu, 15 Aug 2019 23:55:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=RkdODmGu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726995AbfHPGyA (ORCPT + 99 others); Fri, 16 Aug 2019 02:54:00 -0400 Received: from lelv0143.ext.ti.com ([198.47.23.248]:33432 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726823AbfHPGyA (ORCPT ); Fri, 16 Aug 2019 02:54:00 -0400 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id x7G6rZOm004713; Fri, 16 Aug 2019 01:53:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1565938415; bh=Gu7E7gqMococXfCNlEpS2YaEPFtnyWvUe/FmGZ/Bp7Q=; h=Subject:To:CC:References:From:Date:In-Reply-To; b=RkdODmGul5qq6uzQyBl7BRLIEWuS9ETqapW5FFHnzSQ/uivM0RhuB7qh7zBSFvpIK z0VK2GsXix0zUckD5p/4Zpr61KeSp4+0jBkVYpqC7ux6/YSXW0qzuyvB4cfOGyGLof j7bMBfevDPDNEuCaGbEn22hwmwMOB/XXgu0arvVw= Received: from DFLE109.ent.ti.com (dfle109.ent.ti.com [10.64.6.30]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x7G6rZ9B053873 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 16 Aug 2019 01:53:35 -0500 Received: from DFLE101.ent.ti.com (10.64.6.22) by DFLE109.ent.ti.com (10.64.6.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Fri, 16 Aug 2019 01:53:35 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DFLE101.ent.ti.com (10.64.6.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Fri, 16 Aug 2019 01:53:35 -0500 Received: from [192.168.2.6] (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id x7G6rXDu088304; Fri, 16 Aug 2019 01:53:33 -0500 Subject: Re: [PATCH v2] dmaengine: ti: dma-crossbar: Fix a memory leak bug To: Wenwen Wang CC: Vinod Koul , Dan Williams , Kate Stewart , Allison Randal , Thomas Gleixner , Enrico Weigelt , "open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM" , open list References: <1565938136-7249-1-git-send-email-wenwen@cs.uga.edu> From: Peter Ujfalusi Message-ID: Date: Fri, 16 Aug 2019 09:53:49 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <1565938136-7249-1-git-send-email-wenwen@cs.uga.edu> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 8bit X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 16/08/2019 9.48, 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. Thank you, 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