From patchwork Tue Jan 15 15:23:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Ding X-Patchwork-Id: 1979221 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id B4A3BDF264 for ; Tue, 15 Jan 2013 15:26:08 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tv8ME-0005D2-NU; Tue, 15 Jan 2013 15:23:22 +0000 Received: from mail-qc0-f171.google.com ([209.85.216.171]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tv8MA-0005CB-7S for linux-arm-kernel@lists.infradead.org; Tue, 15 Jan 2013 15:23:18 +0000 Received: by mail-qc0-f171.google.com with SMTP id d1so138202qca.30 for ; Tue, 15 Jan 2013 07:23:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=OpJLz1p5H5uBpKm8D6BiUvPFU/ZpcCU577KRoiHEJAI=; b=n3mHBkWizEDTgQZFdAnCHhTdZfb7yRO6adnYer4vI5bJ7aY3ppzkaP1Rvc/cHtLh+0 qpk/jq6j65LvrhQSg9Q2PYPlah3m0YIj3J8DXRMVFYFrkpEtmx+HR6OSD+wlq7MObYwZ txN4hCizMa2+fJddOgnT0n7KBLzL8kNhLTLTdmybX1DHQmCFwMu956Iw/5WxrTZh3Ga0 gtD1y1dsvxPo5LYt98/ngQsvb5ZL3HTIwxqeiXUWV/2d2UMN/9/8S/YgCpUQCvkNd0Ds TtDGfLqztL1q7nywE0fqi5Q+udyn2mw2t/gXVGNMg61m0DKC9dsz/+51yXGqxVwTHy0r eFpg== X-Received: by 10.224.202.1 with SMTP id fc1mr74944955qab.60.1358263395127; Tue, 15 Jan 2013 07:23:15 -0800 (PST) Received: from gmail.com (ec2-54-243-39-165.compute-1.amazonaws.com. [54.243.39.165]) by mx.google.com with ESMTPS id fv7sm12056921qab.3.2013.01.15.07.23.13 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 15 Jan 2013 07:23:14 -0800 (PST) Date: Tue, 15 Jan 2013 15:23:08 +0000 From: Cong Ding To: Gregory CLEMENT Subject: [PATCH v2] clk: mvebu/clk-cpu.c: fix memory leakage Message-ID: <20130115152307.GA25615@gmail.com> References: <1358183892-28928-1-git-send-email-dinggnu@gmail.com> <50F563EC.3030804@free-electrons.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <50F563EC.3030804@free-electrons.com> User-Agent: Mutt/1.5.20 (2009-12-10) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130115_102318_365528_7BB8164C X-CRM114-Status: GOOD ( 12.26 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (dinggnu[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.216.171 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Thomas Petazzoni , linux-kernel@vger.kernel.org, "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From 75c73077905b822be6e8a32a09d6b0cdb5e61763 Mon Sep 17 00:00:00 2001 From: Cong Ding Date: Mon, 14 Jan 2013 18:06:26 +0100 Subject: [PATCH v2] clk: mvebu/clk-cpu.c: fix memory leakage the variable cpuclk and clk_name should be properly freed when error happens. Signed-off-by: Cong Ding Acked-by: Jason Cooper --- drivers/clk/mvebu/clk-cpu.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/clk/mvebu/clk-cpu.c b/drivers/clk/mvebu/clk-cpu.c index ff004578..1066a43 100644 --- a/drivers/clk/mvebu/clk-cpu.c +++ b/drivers/clk/mvebu/clk-cpu.c @@ -124,7 +124,7 @@ void __init of_cpu_clk_setup(struct device_node *node) clks = kzalloc(ncpus * sizeof(*clks), GFP_KERNEL); if (WARN_ON(!clks)) - return; + goto clks_out; for_each_node_by_type(dn, "cpu") { struct clk_init_data init; @@ -134,11 +134,13 @@ void __init of_cpu_clk_setup(struct device_node *node) int cpu, err; if (WARN_ON(!clk_name)) - return; + goto bail_out; err = of_property_read_u32(dn, "reg", &cpu); - if (WARN_ON(err)) - return; + if (WARN_ON(err)) { + kfree(clk_name); + goto bail_out; + } sprintf(clk_name, "cpu%d", cpu); parent_clk = of_clk_get(node, 0); @@ -156,8 +158,10 @@ void __init of_cpu_clk_setup(struct device_node *node) init.num_parents = 1; clk = clk_register(NULL, &cpuclk[cpu].hw); - if (WARN_ON(IS_ERR(clk))) + if (WARN_ON(IS_ERR(clk))) { + kfree(clk_name); goto bail_out; + } clks[cpu] = clk; } clk_data.clk_num = MAX_CPU; @@ -167,6 +171,7 @@ void __init of_cpu_clk_setup(struct device_node *node) return; bail_out: kfree(clks); +clks_out: kfree(cpuclk); }