2009-07-17 11:09:14

by Xiaotian Feng

Subject: [RFC PATCH] slub: release kobject if sysfs_create_group failed in sysfs_slab_add

In sysfs_slab_add, after kobject_init_and_add, kobject is inited and added.
Later, if sysfs_create_group fails, just simply return an error. This may
cause a memory leak. unlink and put the kobject if sysfs_create_group failed.

Signed-off-by: Xiaotian Feng <[email protected]>
---
mm/slub.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/mm/slub.c b/mm/slub.c
index b9f1491..f910964 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -4543,8 +4543,11 @@ static int sysfs_slab_add(struct kmem_cache *s)
}

err = sysfs_create_group(&s->kobj, &slab_attr_group);
- if (err)
+ if (err) {
+ kobject_del(&s->kobj);
+ kobject_put(&s->kobj);
return err;
+ }
kobject_uevent(&s->kobj, KOBJ_ADD);
if (!unmergeable) {
/* Setup first alias */
--
1.6.2.5

2009-07-17 16:39:39

by Christoph Lameter

Subject: Re: [RFC PATCH] slub: release kobject if sysfs_create_group failed in sysfs_slab_add

Acked-by: Christoph Lameter <[email protected]>