[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20210114132945.GX3975472@dell>
Date: Thu, 14 Jan 2021 13:29:45 +0000
From: Lee Jones <lee.jones@...aro.org>
To: Meng.Li@...driver.com
Cc: linux-kernel@...r.kernel.org, arnd@...db.de,
Kexin.Hao@...driver.com
Subject: Re: [PATCH] Revert "mfd: syscon: Don't free allocated name for
regmap_config"
On Mon, 28 Dec 2020, Meng.Li@...driver.com wrote:
> From: Limeng <Meng.Li@...driver.com>
>
> This reverts commit 529a1101212a785c5df92c314b0e718287150c3b.
But you haven't Cc:ed the author of that commit.
You need to do that, please re-send.
> 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")
> Cc: stable@...r.kernel.org
> Signed-off-by: Meng Li <Meng.Li@...driver.com>
> ---
> drivers/mfd/syscon.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c
> index ca465794ea9c..df5cebb372a5 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 @@ 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);
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
Powered by blists - more mailing lists