From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754317Ab3JHFn6 (ORCPT <rfc822;w@1wt.eu>);
	Tue, 8 Oct 2013 01:43:58 -0400
Received: from mail-pd0-f176.google.com ([209.85.192.176]:58264 "EHLO
	mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753942Ab3JHFn4 convert rfc822-to-8bit (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 8 Oct 2013 01:43:56 -0400
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8BIT
To: Felipe Pena <felipensp@gmail.com>, Michal Simek <michal.simek@xilinx.com>,
        Stephen Boyd <sboyd@codeaurora.org>,
        Maxime Ripard <maxime.ripard@free-electrons.com>,
        =?utf-8?q?S=C3=B6ren_Brinkmann?= <soren.brinkmann@xilinx.com>
From: Mike Turquette <mturquette@linaro.org>
In-Reply-To: <1381199144-5827-1-git-send-email-felipensp@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        Felipe Pena <felipensp@gmail.com>
References: <1381199144-5827-1-git-send-email-felipensp@gmail.com>
Message-ID: <20131008054353.7445.57617@quantum>
User-Agent: alot/0.3.4
Subject: Re: [PATCHv2 1/1] clk/zynq: Fix possible memory leak
Date: Mon, 07 Oct 2013 22:43:53 -0700
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Quoting Felipe Pena (2013-10-07 19:25:44)
> 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 <felipensp@gmail.com>
> Acked-by: Sören Brinkmann <soren.brinkmann@xilinx.com>

Taken into clk-next.

Thanks!
Mike

> ---
>  drivers/clk/zynq/clkc.c |   16 +++++++++++++++-
>  1 file changed, 15 insertions(+), 1 deletion(-)
> 
> 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);
>  }
> --
> 1.7.10.4