From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Sat, 25 Nov 2006 19:09:30 +0000 (-0800)
Subject: [PATCH] Fix device_attribute memory leak in device_del
X-Git-Tag: v2.6.19~36
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=82189b9807e05ea8d1f69de5bf92eaf244a0eb12;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 68ad11af22b..002fde46d38 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -591,8 +591,10 @@ void device_del(struct device * dev)
 
 	if (parent)
 		klist_del(&dev->knode_parent);
-	if (dev->devt_attr)
+	if (dev->devt_attr) {
 		device_remove_file(dev, dev->devt_attr);
+		kfree(dev->devt_attr);
+	}
 	if (dev->class) {
 		sysfs_remove_link(&dev->kobj, "subsystem");
 		sysfs_remove_link(&dev->class->subsys.kset.kobj, dev->bus_id);