[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <SJ0PR11MB50721C1BA31F2D624E7C63EEF1AA0@SJ0PR11MB5072.namprd11.prod.outlook.com>
Date: Tue, 12 Jan 2021 02:19:32 +0000
From: "Li, Meng" <Meng.Li@...driver.com>
To: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
CC: "lee.jones@...aro.org" <lee.jones@...aro.org>,
"arnd@...db.de" <arnd@...db.de>,
"Hao, Kexin" <Kexin.Hao@...driver.com>
Subject: RE: [PATCH] Revert "mfd: syscon: Don't free allocated name for
regmap_config"
Is there any comment on this patch?
Thanks,
Limeng
> -----Original Message-----
> From: Li, Meng <Meng.Li@...driver.com>
> Sent: Monday, December 28, 2020 10:06 AM
> To: linux-kernel@...r.kernel.org
> Cc: lee.jones@...aro.org; arnd@...db.de; Hao, Kexin
> <Kexin.Hao@...driver.com>; Li, Meng <Meng.Li@...driver.com>
> Subject: [PATCH] Revert "mfd: syscon: Don't free allocated name for
> regmap_config"
>
> From: Limeng <Meng.Li@...driver.com>
>
> This reverts commit 529a1101212a785c5df92c314b0e718287150c3b.
>
> 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);
> --
> 2.17.1
Powered by blists - more mailing lists