2020-06-17 15:24:14

by Charles Keepax

[permalink] [raw]
Subject: [PATCH] regmap: Fix memory leak from regmap_register_patch

When a register patch is registered the reg_sequence is copied but the
memory allocated is never freed. Add a kfree in regmap_exit to clean it
up.

Fixes: 22f0d90a3482 ("regmap: Support register patch sets")
Signed-off-by: Charles Keepax <[email protected]>
---
drivers/base/regmap/regmap.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 94e2e2d1824bb..414422e1a2e6e 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1349,6 +1349,7 @@ void regmap_exit(struct regmap *map)
if (map->hwlock)
hwspin_lock_free(map->hwlock);
kfree_const(map->name);
+ kfree(map->patch);
kfree(map);
}
EXPORT_SYMBOL_GPL(regmap_exit);
--
2.11.0


2020-06-17 16:38:48

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] regmap: Fix memory leak from regmap_register_patch

On Wed, 17 Jun 2020 16:21:29 +0100, Charles Keepax wrote:
> When a register patch is registered the reg_sequence is copied but the
> memory allocated is never freed. Add a kfree in regmap_exit to clean it
> up.

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git for-next

Thanks!

[1/1] regmap: Fix memory leak from regmap_register_patch
commit: 95b2c3ec4cb1689db2389c251d39f64490ba641c

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark