* [PATCH] clk: hisilicon: Fix the memory leak issues
@ 2020-11-06 20:35 Dongjiu Geng
[not found] ` <30b24944-1315-b6de-5290-28b9d7842610@web.de>
0 siblings, 1 reply; 2+ messages in thread
From: Dongjiu Geng @ 2020-11-06 20:35 UTC (permalink / raw)
To: mturquette, sboyd, linux-clk, linux-kernel, gengdongjiu
When return errors, the clock driver does not unmap
the mapped memory, so fix this issue.
Signed-off-by: Dongjiu Geng <gengdongjiu@huawei.com>
---
drivers/clk/hisilicon/clk-hi3620.c | 8 ++++++--
drivers/clk/hisilicon/clk.c | 5 ++++-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/clk/hisilicon/clk-hi3620.c b/drivers/clk/hisilicon/clk-hi3620.c
index a3d04c7c3da8..d5f1a8df4b1c 100644
--- a/drivers/clk/hisilicon/clk-hi3620.c
+++ b/drivers/clk/hisilicon/clk-hi3620.c
@@ -463,12 +463,16 @@ static void __init hi3620_mmc_clk_init(struct device_node *node)
}
clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL);
- if (WARN_ON(!clk_data))
+ if (WARN_ON(!clk_data)) {
+ iounmap(base);
return;
+ }
clk_data->clks = kcalloc(num, sizeof(*clk_data->clks), GFP_KERNEL);
- if (!clk_data->clks)
+ if (!clk_data->clks) {
+ iounmap(base);
return;
+ }
for (i = 0; i < num; i++) {
struct hisi_mmc_clock *mmc_clk = &hi3620_mmc_clks[i];
diff --git a/drivers/clk/hisilicon/clk.c b/drivers/clk/hisilicon/clk.c
index 54d9fdc93599..53acaff32934 100644
--- a/drivers/clk/hisilicon/clk.c
+++ b/drivers/clk/hisilicon/clk.c
@@ -69,8 +69,10 @@ struct hisi_clock_data *hisi_clk_init(struct device_node *np,
}
clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL);
- if (!clk_data)
+ if (!clk_data) {
+ iounmap(base);
goto err;
+ }
clk_data->base = base;
clk_table = kcalloc(nr_clks, sizeof(*clk_table), GFP_KERNEL);
@@ -82,6 +84,7 @@ struct hisi_clock_data *hisi_clk_init(struct device_node *np,
of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data->clk_data);
return clk_data;
err_data:
+ iounmap(base);
kfree(clk_data);
err:
return NULL;
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-09 9:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-06 20:35 [PATCH] clk: hisilicon: Fix the memory leak issues Dongjiu Geng
[not found] ` <30b24944-1315-b6de-5290-28b9d7842610@web.de>
2020-11-09 9:51 ` Dongjiu Geng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).