Commit 529a1101 authored Sep 03, 2020 by Marc Zyngier Committed by Lee Jones Sep 30, 2020

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: e15d7f2b ("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>

parent 05027df1

drivers/mfd/syscon.c

+1 −1

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

Admin message