From: meng.li@windriver.com
To: linux-kernel@vger.kernel.org
Cc: maz@kernel.org, lee.jones@linaro.org, arnd@arndb.de,
Kexin.Hao@windriver.com, meng.li@windriver.com
Subject: [v2][PATCH] Revert "mfd: syscon: Don't free allocated name for regmap_config"
Date: Fri, 15 Jan 2021 09:50:50 +0800 [thread overview]
Message-ID: <20210115015050.26657-1-meng.li@windriver.com> (raw)
From: Limeng <Meng.Li@windriver.com>
This reverts commit 529a1101212a785c5df92c314b0e718287150c3b.
The reverted patch moves the memory free to error path, but introduce
a memory leak. There is another commit 94cc89eb8fa5("regmap: debugfs:
Fix handling of name string for debugfs init delays") fixing this
debugfs init issue from root cause. With this fixing, the name field
in struct regmap_debugfs_node is removed. When initialize debugfs
for syscon driver, the name field of struct regmap_config is not
used anymore. So, revert this patch directly to avoid memory leak.
v2:
Notify the author of the reverted commit by adding Cc:
Fixes: 529a1101212a("mfd: syscon: Don't free allocated name for regmap_config")
Cc: Marc Zyngier <maz@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Meng Li <Meng.Li@windriver.com>
---
drivers/mfd/syscon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c
index ca465794ea9c..df5cebb372a5 100644
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@ -108,6 +108,7 @@ static struct syscon *of_syscon_register(struct device_node *np, bool check_clk)
syscon_config.max_register = resource_size(&res) - reg_io_width;
regmap = regmap_init_mmio(NULL, base, &syscon_config);
+ kfree(syscon_config.name);
if (IS_ERR(regmap)) {
pr_err("regmap init failed\n");
ret = PTR_ERR(regmap);
@@ -144,7 +145,6 @@ static struct syscon *of_syscon_register(struct device_node *np, bool check_clk)
regmap_exit(regmap);
err_regmap:
iounmap(base);
- kfree(syscon_config.name);
err_map:
kfree(syscon);
return ERR_PTR(ret);
--
2.17.1
next reply other threads:[~2021-01-15 1:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-15 1:50 meng.li [this message]
2021-02-22 3:45 ` Li, Meng
2021-02-22 9:12 ` Marc Zyngier
2021-02-22 9:21 ` Lee Jones
2021-02-22 9:37 ` Li, Meng
2021-03-09 9:43 ` Lee Jones
2021-03-09 9:51 ` Li, Meng
2021-03-09 18:15 ` Lee Jones
2021-03-10 1:41 ` Li, Meng
2021-03-10 8:31 ` Lee Jones
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=20210115015050.26657-1-meng.li@windriver.com \
--to=meng.li@windriver.com \
--cc=Kexin.Hao@windriver.com \
--cc=arnd@arndb.de \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@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
Powered by JetHome