Skip to contentSkip to conversation

Revert "mfd: syscon: Don't free allocated name for regmap_config"

PATCH Superseded [email protected] 2 participants 3 messages Dec 28, 2020 – Jan 14, 2021

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "mfd: syscon: Don't free allocated name for regmap_config"

From: Limeng <[email protected]>

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.

Fixes 529a1101212a("mfd: syscon: Don't free allocated name for regmap_config")
---
 drivers/mfd/syscon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/syscon.c +1 -1
index ca465794ea9c..df5cebb372a5 100644
@@ -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);
Signature · 1 line
2.17.1
author
#1 lore raw

Is there any comment on this patch?

Thanks,
Limeng

Quoted 53 lines

-----Original Message-----
From: Li, Meng <[email protected]>
Sent: Monday, December 28, 2020 10:06 AM
To: [email protected]
Cc: [email protected]; [email protected]; Hao, Kexin <[email protected]>; Li, Meng <[email protected]>
Subject: [PATCH] Revert "mfd: syscon: Don't free allocated name for regmap_config"

From: Limeng <[email protected]>

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.

Fixes 529a1101212a("mfd: syscon: Don't free allocated name for

regmap_config")

---
 drivers/mfd/syscon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/syscon.c index renamed from drivers/mfd/syscon.c +0 -0

ca465794ea9c..df5cebb372a5 100644

drivers/mfd/syscon.c +1 -0
@@ -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");
drivers/mfd/syscon.c +0 -1
 		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

#2 lore raw
In reply to [email protected]
Quoted 3 lines · On Mon, 28 Dec 2020, [email protected] wrote:

From: Limeng <[email protected]>

This reverts commit 529a1101212a785c5df92c314b0e718287150c3b.

But you haven't Cc:ed the author of that commit.

You need to do that, please re-send.

Quoted 35 lines

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.

Fixes 529a1101212a("mfd: syscon: Don't free allocated name for regmap_config")
---
 drivers/mfd/syscon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/syscon.c +1 -1
index ca465794ea9c..df5cebb372a5 100644
@@ -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);
Signature · 4 lines
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog