projects/linux·commit 875dd235

Merge tag 'regmap-fix-v6.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

875dd235 · Linus Torvalds <[email protected]> · 2025-07-20 08:56:40 -07:00

Pull regmap fix from Mark Brown:
 "A fix for a memory leak when we get an error during regmap init for a
  bus that uses free_on_exit to clean up device specific data"

* tag 'regmap-fix-v6.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: fix potential memory leak of regmap_bus
Commit
875dd235ceca6dc1821ea4ba6a7d41cdf0df6a55
Parents
e2e9e161 · c871c199

Merge commit. Changes below are compared with the first parent: e2e9e161.

Changes

1 files changed · +2 −0

FileStatusAddDelContent
drivers/base/regmap/regmap.cmodified+2−0View file

drivers/base/regmap/regmap.c

View file
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index f2843f8..1f3f782 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1173,6 +1173,8 @@ err_name:
err_map:
kfree(map);
err:
+ if (bus && bus->free_on_exit)
+ kfree(bus);
return ERR_PTR(ret);
}
EXPORT_SYMBOL_GPL(__regmap_init);