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

torvalds · torvalds · commit 875dd235ceca · 2025-07-20T08:56:40.000-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
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
@@ -1173,6 +1173,8 @@ struct regmap *__regmap_init(struct device *dev,
 err_map:
 	kfree(map);
 err:
+	if (bus && bus->free_on_exit)
+		kfree(bus);
 	return ERR_PTR(ret);
 }
 EXPORT_SYMBOL_GPL(__regmap_init);

Original file line number	Diff line number	Diff line change
`@@ -1173,6 +1173,8 @@ struct regmap __regmap_init(struct device dev,`
`1173`	`1173`	`err_map:`
`1174`	`1174`	`kfree(map);`
`1175`	`1175`	`err:`
	`1176`	`+ if (bus && bus->free_on_exit)`
	`1177`	`+ kfree(bus);`
`1176`	`1178`	`return ERR_PTR(ret);`
`1177`	`1179`	`}`
`1178`	`1180`	`EXPORT_SYMBOL_GPL(__regmap_init);`