From patchwork Tue Oct 8 02:25:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felipe Pena X-Patchwork-Id: 281304 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8EC022C00A8 for ; Tue, 8 Oct 2013 13:26:55 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VTN0J-0006LD-Pr; Tue, 08 Oct 2013 02:26:31 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VTN0H-0007Aj-14; Tue, 08 Oct 2013 02:26:29 +0000 Received: from mail-ye0-x22b.google.com ([2607:f8b0:4002:c04::22b]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VTN0E-0007AC-2z for linux-arm-kernel@lists.infradead.org; Tue, 08 Oct 2013 02:26:26 +0000 Received: by mail-ye0-f171.google.com with SMTP id q3so1781279yen.16 for ; Mon, 07 Oct 2013 19:26:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=MY2rx6YWcOrqRD5tgJC3RCOON3Poj/TYuuVRecA6kJc=; b=ixwib9zE+uRm/tr2dqppJSk3x1c4W7XVxPwCJSWgwjTraCHdsVIu6kJV/hd5iLv/Iu RTm1hfI2a9NTMv7o+kDi3gMqhNs7N8QIGon9rfaIRyge/mCgfHAZGYJ417sJyhk1xLyI umPJI3AwH5PjOiRTN4I5dvao0RBDc0tHoVfk8bf2bOwDsZc2pI9Gnwv/No5L5OV97rZ7 Fpl9sEq8Z3loTw2xYnXPNYQAc4Rnx6QzULKWlNGdaQVueIWOp8u2sONP7aYrns/X6VB4 k0f/nxcCpfLrCvSfXTLbDINXtBzrInatdyqJCSDiXa/qpiJEe+/qW57vIl8q/5uEJcnC 70Vw== X-Received: by 10.236.176.67 with SMTP id a43mr124853yhm.68.1381199164520; Mon, 07 Oct 2013 19:26:04 -0700 (PDT) Received: from localhost.localdomain (189-105-138-32.user.veloxzone.com.br. [189.105.138.32]) by mx.google.com with ESMTPSA id e10sm48510382yhj.1.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 07 Oct 2013 19:26:03 -0700 (PDT) From: Felipe Pena To: Mike Turquette , Michal Simek , Stephen Boyd , Maxime Ripard , =?UTF-8?q?S=C3=B6ren=20Brinkmann?= Subject: =?UTF-8?q?=5BPATCHv2=201/1=5D=20clk/zynq=3A=20Fix=20possible=20memory=20leak?= Date: Mon, 7 Oct 2013 23:25:44 -0300 Message-Id: <1381199144-5827-1-git-send-email-felipensp@gmail.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131007_222626_204242_FD25E616 X-CRM114-Status: UNSURE ( 8.83 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (felipensp[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: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Felipe Pena X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org The zynq_clk_register_fclk function can leak memory (fclk_lock) when unable to alloc memory for fclk_gate_lock Signed-off-by: Felipe Pena Acked-by: Sören Brinkmann --- drivers/clk/zynq/clkc.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) -- 1.7.10.4 diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c index cc40fe6..10772aa 100644 --- a/drivers/clk/zynq/clkc.c +++ b/drivers/clk/zynq/clkc.c @@ -117,13 +117,19 @@ static void __init zynq_clk_register_fclk(enum zynq_clk fclk, goto err; fclk_gate_lock = kmalloc(sizeof(*fclk_gate_lock), GFP_KERNEL); if (!fclk_gate_lock) - goto err; + goto err_fclk_gate_lock; spin_lock_init(fclk_lock); spin_lock_init(fclk_gate_lock); mux_name = kasprintf(GFP_KERNEL, "%s_mux", clk_name); + if (!mux_name) + goto err_mux_name; div0_name = kasprintf(GFP_KERNEL, "%s_div0", clk_name); + if (!div0_name) + goto err_div0_name; div1_name = kasprintf(GFP_KERNEL, "%s_div1", clk_name); + if (!div1_name) + goto err_div1_name; clk = clk_register_mux(NULL, mux_name, parents, 4, CLK_SET_RATE_NO_REPARENT, fclk_ctrl_reg, 4, 2, 0, @@ -147,6 +153,14 @@ static void __init zynq_clk_register_fclk(enum zynq_clk fclk, return; +err_div1_name: + kfree(div0_name); +err_div0_name: + kfree(mux_name); +err_mux_name: + kfree(fclk_gate_lock); +err_fclk_gate_lock: + kfree(fclk_lock); err: clks[fclk] = ERR_PTR(-ENOMEM); }