From patchwork Mon Jan 14 21:18:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Ding X-Patchwork-Id: 1973661 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 B8829DF2E1 for ; Mon, 14 Jan 2013 21:22:02 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TurR7-0003kf-LD; Mon, 14 Jan 2013 21:19:17 +0000 Received: from mail-bk0-f43.google.com ([209.85.214.43]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TurQz-0003iu-5p for linux-arm-kernel@lists.infradead.org; Mon, 14 Jan 2013 21:19:10 +0000 Received: by mail-bk0-f43.google.com with SMTP id jf20so2249795bkc.2 for ; Mon, 14 Jan 2013 13:19:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=i8Nz6w/Y6Z62cN5g97Z6yTYiG9wo8uzBT/AlNsYycF0=; b=k36KJ5FDv4s+aplWnajI/94Qda1vqd3lQ4H2cT3WgAs9Y7c9YxX/bIZdQGaQpNSCe/ sOKOFkIKcLXkTgBJfQuMS2pGkqA0jnfyAfslNBwWBksaZqVmlxC/v4WjPkNIqddQjXwE 7hQlRSireVPgt4qKmLQIIJOYBciFtcXOC4eqD9lLB+N+yUSRUaD+PShtmt5nihjYqybo 3OnraGoExvuc8H4XvrLSlySOadAEkh4ATi3MOvDfnxAhUK9yeH/o+Vq3UDdajPnoVxk4 d2SyirQn9OVvbaiMUEmDQ7feG2OcAp/0gbFVeEvTVEAgvnoJiWnUdHzmgh52BURSEs2k 3q4A== X-Received: by 10.204.11.142 with SMTP id t14mr40565002bkt.9.1358198346072; Mon, 14 Jan 2013 13:19:06 -0800 (PST) Received: from localhost.localdomain (p5B2F5DF4.dip.t-dialin.net. [91.47.93.244]) by mx.google.com with ESMTPS id z5sm11203738bkv.11.2013.01.14.13.19.02 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 14 Jan 2013 13:19:05 -0800 (PST) From: Cong Ding To: Russell King , Soren Brinkmann , Josh Cartwright , Michal Simek , Peter Crosthwaite , John Linn , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm: mach-zynq/timer.c: fix memory leakage Date: Mon, 14 Jan 2013 22:18:46 +0100 Message-Id: <1358198331-31949-1-git-send-email-dinggnu@gmail.com> X-Mailer: git-send-email 1.7.10.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130114_161909_598862_DD5FDA9E X-CRM114-Status: GOOD ( 10.25 ) 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.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.43 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (dinggnu[at]gmail.com) -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: Cong Ding 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: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org the variable ttccs allocated isn't freed when error occurs, so we call kfree before return. Signed-off-by: Cong Ding --- arch/arm/mach-zynq/timer.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-zynq/timer.c b/arch/arm/mach-zynq/timer.c index f9fbc9c..df04761 100644 --- a/arch/arm/mach-zynq/timer.c +++ b/arch/arm/mach-zynq/timer.c @@ -203,15 +203,15 @@ static void __init zynq_ttc_setup_clocksource(struct device_node *np, err = of_property_read_u32(np, "reg", ®); if (WARN_ON(err)) - return; + goto out; clk = of_clk_get_by_name(np, "cpu_1x"); if (WARN_ON(IS_ERR(clk))) - return; + goto out; err = clk_prepare_enable(clk); if (WARN_ON(err)) - return; + goto out; ttccs->xttc.base_addr = base + reg * 4; @@ -229,7 +229,10 @@ static void __init zynq_ttc_setup_clocksource(struct device_node *np, err = clocksource_register_hz(&ttccs->cs, clk_get_rate(clk) / PRESCALE); if (WARN_ON(err)) - return; + goto out; + return; +out: + kfree(ttccs); } static void __init zynq_ttc_setup_clockevent(struct device_node *np, @@ -245,21 +248,21 @@ static void __init zynq_ttc_setup_clockevent(struct device_node *np, err = of_property_read_u32(np, "reg", ®); if (WARN_ON(err)) - return; + goto out; ttcce->xttc.base_addr = base + reg * 4; ttcce->clk = of_clk_get_by_name(np, "cpu_1x"); if (WARN_ON(IS_ERR(ttcce->clk))) - return; + goto out; err = clk_prepare_enable(ttcce->clk); if (WARN_ON(err)) - return; + goto out; irq = irq_of_parse_and_map(np, 0); if (WARN_ON(!irq)) - return; + goto out; ttcce->ce.name = np->name; ttcce->ce.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT; @@ -277,11 +280,15 @@ static void __init zynq_ttc_setup_clockevent(struct device_node *np, err = request_irq(irq, xttcps_clock_event_interrupt, IRQF_TIMER, np->name, ttcce); if (WARN_ON(err)) - return; + goto out; clockevents_config_and_register(&ttcce->ce, clk_get_rate(ttcce->clk) / PRESCALE, 1, 0xfffe); + return; + +out: + kfree(ttcce); } static const __initconst struct of_device_id zynq_ttc_match[] = {