summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@gmail.com>2006-11-25 11:09:30 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-25 13:28:33 -0800
commit82189b9807e05ea8d1f69de5bf92eaf244a0eb12 (patch)
treeecc6f1cf933a249ea1a9a9858a7a90878ec4162b /drivers
parent533221fbaf001692d5db646f84f7d033fac78cc7 (diff)
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 68ad11af22b4..002fde46d38d 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);