Browse Source

[PATCH] Fix device_attribute memory leak in device_del

dev->devt_attr is allocated in device_add() but it is never freed in
device_del() in the drivers/base/core.c file (reported by kmemleak).

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Acked-by: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Catalin Marinas 18 years ago
parent
commit
82189b9807
1 changed files with 3 additions and 1 deletions
  1. 3 1
      drivers/base/core.c

+ 3 - 1
drivers/base/core.c

@@ -591,8 +591,10 @@ void device_del(struct device * dev)
 
 
 	if (parent)
 	if (parent)
 		klist_del(&dev->knode_parent);
 		klist_del(&dev->knode_parent);
-	if (dev->devt_attr)
+	if (dev->devt_attr) {
 		device_remove_file(dev, dev->devt_attr);
 		device_remove_file(dev, dev->devt_attr);
+		kfree(dev->devt_attr);
+	}
 	if (dev->class) {
 	if (dev->class) {
 		sysfs_remove_link(&dev->kobj, "subsystem");
 		sysfs_remove_link(&dev->kobj, "subsystem");
 		sysfs_remove_link(&dev->class->subsys.kset.kobj, dev->bus_id);
 		sysfs_remove_link(&dev->class->subsys.kset.kobj, dev->bus_id);