From: Bernard Zhao <bernard@vivo.com>
To: Neil Armstrong <narmstrong@baylibre.com>,
Jerome Brunet <jbrunet@baylibre.com>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
Kevin Hilman <khilman@baylibre.com>,
linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Cc: opensource.kernel@vivo.com, Bernard Zhao <bernard@vivo.com>
Subject: [PATCH] clk/meson: fixes memleak issue in init err branch
Date: Tue, 28 Apr 2020 20:14:15 -0700 [thread overview]
Message-ID: <20200429031416.3900-1-bernard@vivo.com> (raw)
In common init function, when run into err branch, we didn`t
use kfree to release kzmalloc area, this may bring in memleak
Signed-off-by: Bernard Zhao <bernard@vivo.com>
---
drivers/clk/meson/meson8b.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c
index 34a70c4b4899..0f07d5a4cd16 100644
--- a/drivers/clk/meson/meson8b.c
+++ b/drivers/clk/meson/meson8b.c
@@ -3687,6 +3687,7 @@ static void __init meson8b_clkc_init_common(struct device_node *np,
if (ret) {
pr_err("%s: Failed to register clkc reset controller: %d\n",
__func__, ret);
+ kfree(rstc);
return;
}
@@ -3710,8 +3711,10 @@ static void __init meson8b_clkc_init_common(struct device_node *np,
continue;
ret = of_clk_hw_register(np, clk_hw_onecell_data->hws[i]);
- if (ret)
+ if (ret) {
+ kfree(rstc);
return;
+ }
}
meson8b_cpu_nb_data.cpu_clk = clk_hw_onecell_data->hws[CLKID_CPUCLK];
@@ -3727,13 +3730,16 @@ static void __init meson8b_clkc_init_common(struct device_node *np,
if (ret) {
pr_err("%s: failed to register the CPU clock notifier\n",
__func__);
+ kfree(rstc);
return;
}
ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get,
clk_hw_onecell_data);
- if (ret)
+ if (ret) {
pr_err("%s: failed to register clock provider\n", __func__);
+ kfree(rstc);
+ }
}
static void __init meson8_clkc_init(struct device_node *np)
--
2.26.2
next reply other threads:[~2020-04-29 3:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 3:14 Bernard Zhao [this message]
2020-04-29 12:37 ` [PATCH] clk/meson: fixes memleak issue in init err branch Jerome Brunet
2020-04-29 17:43 ` Martin Blumenstingl
2020-04-30 3:33 ` 赵军奎
2020-05-02 11:10 ` Martin Blumenstingl
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=20200429031416.3900-1-bernard@vivo.com \
--to=bernard@vivo.com \
--cc=jbrunet@baylibre.com \
--cc=khilman@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=narmstrong@baylibre.com \
--cc=opensource.kernel@vivo.com \
--cc=sboyd@kernel.org \
/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