diff options
| author | Limeng <Meng.Li@windriver.com> | 2021-04-07 13:25:25 +0800 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2021-06-02 10:50:00 +0100 |
| commit | 56a1188159cb2b87fbcb5a7a7afb38a4dd9db0c1 (patch) | |
| tree | 908257fb7392f1c531362c28a41eb03350f0688c /drivers/mfd/syscon.c | |
| parent | 5a23e8b0fd6010e25ae58362292235cc9213ca57 (diff) | |
| download | lwn-56a1188159cb2b87fbcb5a7a7afb38a4dd9db0c1.tar.gz lwn-56a1188159cb2b87fbcb5a7a7afb38a4dd9db0c1.zip | |
mfd: syscon: Free the allocated name field of struct regmap_config
The commit 529a1101212a("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 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, 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: 529a1101212a("mfd: syscon: Don't free allocated name for regmap_config")
Signed-off-by: Meng Li <Meng.Li@windriver.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/syscon.c')
| -rw-r--r-- | drivers/mfd/syscon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c index c6f139b2e0c0..765c0210cb52 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 @@ err_clk: regmap_exit(regmap); err_regmap: iounmap(base); - kfree(syscon_config.name); err_map: kfree(syscon); return ERR_PTR(ret); |