Commit 56a11881 authored by Limeng's avatar Limeng Committed by Lee Jones
Browse files

mfd: syscon: Free the allocated name field of struct regmap_config 



The commit 529a1101("mfd: syscon: Don't free allocated name
for regmap_config") doesn't free the allocated name field of struct
regmap_config, but introduce a memory leak. There is another
commit 94cc89eb("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, the allocated
name field of struct regmap_config is need to be freed directly after
regmap initialization to avoid memory leak.

Cc: stable@vger.kernel.org
Fixes: 529a1101("mfd: syscon: Don't free allocated name for regmap_config")
Signed-off-by: default avatarMeng Li <Meng.Li@windriver.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 5a23e8b0

drivers/mfd/syscon.c

+1 −1
Original line number Diff line number Diff line
@@ -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);