From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29645C43217 for ; Wed, 23 Nov 2022 09:01:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236911AbiKWJBv (ORCPT ); Wed, 23 Nov 2022 04:01:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236893AbiKWJBt (ORCPT ); Wed, 23 Nov 2022 04:01:49 -0500 Received: from gloria.sntech.de (gloria.sntech.de [185.11.138.130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B82961025D6; Wed, 23 Nov 2022 01:01:47 -0800 (PST) Received: from ip5b412258.dynamic.kabel-deutschland.de ([91.65.34.88] helo=phil.localnet) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oxldM-0006px-PE; Wed, 23 Nov 2022 10:01:32 +0100 From: Heiko Stuebner To: mturquette@baylibre.com, sboyd@kernel.org, mturquette@linaro.org, Xiu Jianfeng Cc: linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] clk: rockchip: Fix memory leak in rockchip_clk_register_pll() Date: Wed, 23 Nov 2022 10:01:30 +0100 Message-ID: <6301679.31r3eYUQgx@phil> In-Reply-To: <20221123032237.64567-1-xiujianfeng@huawei.com> References: <20221123032237.64567-1-xiujianfeng@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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) clk_unregister(mux_clk); ... Heiko > kfree(pll); > return mux_clk; > } >