Skip to contentSkip to conversation

driver core: bus: Free the kobject.name if kset_register fails

PATCH In review Chen Lin Z 2 participants 2 messages Jun 9, 2015 – Aug 6, 2015 Driver core

lore
Share & tools
lore

Chen Lin Z

author
#0 lore raw

PATCH 1/1 driver core: bus: Free the kobject.name if kset_register fails

if register two bus with the same name, kset_register will fail. it need free kobject.name, otherwise there is a memory leak.

---
 drivers/base/bus.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/base/bus.c +3 -1
index 79bc203..9375048 100644
@@ -894,8 +894,10 @@ int bus_register(struct bus_type *bus)
 	priv->drivers_autoprobe = 1;
 
 	retval = kset_register(&priv->subsys);
-	if (retval)
+	if (retval) {
+		kfree(priv->subsys.kobj.name);
 		goto out;
+	}
 
 	retval = bus_create_file(bus, &bus_attr_uevent);
 	if (retval)
Signature · 1 line
1.9.1
maintainer
#1 lore raw
Quoted 13 lines · Chen Lin Z

if register two bus with the same name, kset_register will fail. it need free kobject.name, otherwise there is a memory leak.

---
 drivers/base/bus.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/base/bus.c +0 -0
index 79bc203..9375048 100644

drivers/base/bus.c int bus_register(struct bus_type *bus) · line 898

Quoted 6 lines
drivers/base/bus.c +2 -1
@@ -894,8 +894,10 @@ int bus_register(struct bus_type *bus)
 	priv->drivers_autoprobe = 1;
 
 	retval = kset_register(&priv->subsys);
-	if (retval)
+	if (retval) {
+		kfree(priv->subsys.kobj.name);

This doesn't solve the problem properly, as all of the other error paths also need to free this memory.

And I really hate to poke around this "deep" into the kobject core, but I understand it's needed here :(

thanks,

greg k-h