diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-09-03 19:02:37 +0300 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2020-09-30 18:25:16 +0300 |
| commit | 529a1101212a785c5df92c314b0e718287150c3b (patch) | |
| tree | 50181f049af410967b87dd6aad5d917202878474 /drivers | |
| parent | 05027df1b94fcb9e23e1af170733a570f5a90356 (diff) | |
| download | linux-529a1101212a785c5df92c314b0e718287150c3b.tar.xz | |
mfd: syscon: Don't free allocated name for regmap_config
The name allocated for the regmap_config structure is freed
pretty early, right after the registration of the MMIO region.
Unfortunately, that doesn't follow the life cycle that debugfs
expects, as it can access the name field long after the free
has occurred.
Move the free on the error path, and keep it forever otherwise.
Fixes: e15d7f2b81d2 ("mfd: syscon: Use a unique name with regmap_config")
Signed-off-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers')
| -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 75859e492984..7a660411c562 100644 --- a/drivers/mfd/syscon.c +++ b/drivers/mfd/syscon.c @@ -108,7 +108,6 @@ 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); @@ -145,6 +144,7 @@ err_clk: regmap_exit(regmap); err_regmap: iounmap(base); + kfree(syscon_config.name); err_map: kfree(syscon); return ERR_PTR(ret); |