Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Subject: Re: [PATCH] clk: rockchip: Fix memory leak in
 rockchip_clk_register_pll()
To:     Heiko Stuebner <heiko@sntech.de>, <mturquette@baylibre.com>,
        <sboyd@kernel.org>, <mturquette@linaro.org>
CC:     <linux-clk@vger.kernel.org>,
        <linux-arm-kernel@lists.infradead.org>,
        <linux-rockchip@lists.infradead.org>,
        <linux-kernel@vger.kernel.org>
References: <20221123032237.64567-1-xiujianfeng@huawei.com>
 <6301679.31r3eYUQgx@phil>
From:   xiujianfeng <xiujianfeng@huawei.com>
Message-ID: <648ff5d2-9a52-3a73-46b8-a903315202d9@huawei.com>
Date:   Wed, 23 Nov 2022 17:21:05 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101
 Thunderbird/78.9.1
MIME-Version: 1.0
In-Reply-To: <6301679.31r3eYUQgx@phil>
Content-Type: text/plain; charset="gbk"; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk

Hi,

?? 2022/11/23 17:01, Heiko Stuebner д??:
> Hi,
> 
> Am Mittwoch, 23. November 2022, 04:22:37 CET schrieb Xiu Jianfeng:
>> If clk_register() fails, @pll->rate_table may have allocated memory by
>> kmemdup(), so it needs to be freed, otherwise will cause memory leak
>> issue, this patch fixes it.
>>
>> Fixes: 90c590254051 ("clk: rockchip: add clock type for pll clocks and pll used on rk3066")
>> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
>> ---
>>   drivers/clk/rockchip/clk-pll.c | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/clk/rockchip/clk-pll.c b/drivers/clk/rockchip/clk-pll.c
>> index 4b9840994295..dc4ce280d125 100644
>> --- a/drivers/clk/rockchip/clk-pll.c
>> +++ b/drivers/clk/rockchip/clk-pll.c
>> @@ -1200,6 +1200,7 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx,
>>   	clk_unregister(mux_clk);
>>   	mux_clk = pll_clk;
>>   err_mux:
>> +	kfree(pll->rate_table);
> 
> I think this free needs to go up to the err_pll block.
> 
> In the code it is
> - clk_register(pll_mux->hw)   -> err_mux
> - kmemdup
> - clk_register(pll->hw)	-> err_pll
> 
> so the kfree for the rate-table should probably
> be at
> 	err_pll:
> 		kfree(rate_table)

Thanks for you review, I think here should be kfree(pll->rate_table) 
instead of kfree(rate_table), because @rate_table is the intput param 
while pll->rate_table is the new allocated memory.

v2 already sent.

> 		clk_unregister(mux_clk);
> 		...
> 
> 
> Heiko
> 
>>   	kfree(pll);
>>   	return mux_clk;
>>   }
>>
> 
> 
> 
> 
> 
> .
>