* [PATCH] mfd: syscon: Fix leak of syscon name
@ 2021-05-25 0:13 Ansuel Smith
2021-05-25 7:44 ` Lee Jones
0 siblings, 1 reply; 2+ messages in thread
From: Ansuel Smith @ 2021-05-25 0:13 UTC (permalink / raw)
To: Lee Jones, Arnd Bergmann, linux-kernel; +Cc: Ansuel Smith
regmap_init_mmio duplicate the name and never free the provided name in
the sysconf_config. Always free the name instead of freeing only on
error to fix error from kmemleak generated by any syscon user.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.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 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 @@ 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.31.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mfd: syscon: Fix leak of syscon name
2021-05-25 0:13 [PATCH] mfd: syscon: Fix leak of syscon name Ansuel Smith
@ 2021-05-25 7:44 ` Lee Jones
0 siblings, 0 replies; 2+ messages in thread
From: Lee Jones @ 2021-05-25 7:44 UTC (permalink / raw)
To: Ansuel Smith; +Cc: Arnd Bergmann, linux-kernel
On Tue, 25 May 2021, Ansuel Smith wrote:
> regmap_init_mmio duplicate the name and never free the provided name in
> the sysconf_config. Always free the name instead of freeing only on
> error to fix error from kmemleak generated by any syscon user.
>
> Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
> ---
> drivers/mfd/syscon.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Which repo have you authored this against?
I believe this is already fixed in -next.
> 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 @@ 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-25 7:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-25 0:13 [PATCH] mfd: syscon: Fix leak of syscon name Ansuel Smith
2021-05-25 7:44 ` Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).