From: Dinh Nguyen <dinguyen@kernel.org>
To: Xiu Jianfeng <xiujianfeng@huawei.com>,
mturquette@baylibre.com, sboyd@kernel.org
Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] clk: socfpga: Fix memory leak in socfpga_gate_init()
Date: Thu, 1 Dec 2022 10:36:48 -0600 [thread overview]
Message-ID: <e037b3b5-3a5a-90c3-0d91-e4882700cbf5@kernel.org> (raw)
In-Reply-To: <20221123031622.63171-1-xiujianfeng@huawei.com>
On 11/22/22 21:16, Xiu Jianfeng wrote:
> Free @socfpga_clk and @ops on the error path to avoid memory leak issue.
>
> Fixes: a30a67be7b6e ("clk: socfpga: Don't have get_parent for single parent ops")
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
> ---
> drivers/clk/socfpga/clk-gate.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
> index 3e347b9e9eff..0c18c55edf8c 100644
> --- a/drivers/clk/socfpga/clk-gate.c
> +++ b/drivers/clk/socfpga/clk-gate.c
> @@ -133,8 +133,10 @@ void __init socfpga_gate_init(struct device_node *node)
> return;
>
> ops = kmemdup(&gateclk_ops, sizeof(gateclk_ops), GFP_KERNEL);
> - if (WARN_ON(!ops))
> + if (WARN_ON(!ops)) {
> + kfree(socfpga_clk);
> return;
> + }
>
> rc = of_property_read_u32_array(node, "clk-gate", clk_gate, 2);
> if (rc)
> @@ -182,6 +184,7 @@ void __init socfpga_gate_init(struct device_node *node)
>
> err = clk_hw_register(NULL, hw_clk);
> if (err) {
> + kfree(ops);
> kfree(socfpga_clk);
> return;
> }
Acked-by: Dinh Nguyen <dinguyen@kernel.org>
next prev parent reply other threads:[~2022-12-01 16:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-23 3:16 [PATCH] clk: socfpga: Fix memory leak in socfpga_gate_init() Xiu Jianfeng
2022-12-01 16:36 ` Dinh Nguyen [this message]
2022-12-09 1:16 ` Stephen Boyd
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e037b3b5-3a5a-90c3-0d91-e4882700cbf5@kernel.org \
--to=dinguyen@kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@kernel.org \
--cc=xiujianfeng@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox