Skip to contentSkip to conversation

Revert "mm/slub: fix a memory leak in sysfs_slab_add()"

PATCH In review Wang Hai 2 participants 2 messages Jan 28, 2021

Subsystems (4)
lore
Share & tools
lore

Wang Hai

author
#0 lore raw

PATCH 1/1 Revert "mm/slub: fix a memory leak in sysfs_slab_add()"

This reverts commit dde3c6b72a16c2db826f54b2d49bdea26c3534a2.

syzbot report a double-free bug. The following case can cause this bug.
- mm/slab_common.c: create_cache(): if the __kmem_cache_create()
fails, it does:

	out_free_cache:
		kmem_cache_free(kmem_cache, s);

- but __kmem_cache_create() - at least for slub() - will have done

	sysfs_slab_add(s)
		-> sysfs_create_group() .. fails ..
		-> kobject_del(&s->kobj); .. which frees s ...

We can't remove the kmem_cache_free() in create_cache(), because other error cases of __kmem_cache_create() do not free this.

So, revert the commit dde3c6b72a16 ("mm/slub: fix a memory leak in sysfs_slab_add()") to fix this.

Reported-by [email protected]
Fixes dde3c6b72a16 ("mm/slub: fix a memory leak in sysfs_slab_add()")
---
 mm/slub.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
mm/slub.c +1 -3
index 69742ab9a21d..7ecbbbe5bc0c 100644
@@ -5625,10 +5625,8 @@ static int sysfs_slab_add(struct kmem_cache *s)
 
 	s->kobj.kset = kset;
 	err = kobject_init_and_add(&s->kobj, &slab_ktype, NULL, "%s", name);
-	if (err) {
-		kobject_put(&s->kobj);
+	if (err)
 		goto out;
-	}
 
 	err = sysfs_create_group(&s->kobj, &slab_attr_group);
 	if (err)
Signature · 1 line
2.17.1
Acked-by on v1 1/1
#1 lore raw
Quoted 18 lines · Wang Hai

This reverts commit dde3c6b72a16c2db826f54b2d49bdea26c3534a2.

syzbot report a double-free bug. The following case can cause this bug.
- mm/slab_common.c: create_cache(): if the __kmem_cache_create()
fails, it does:

	out_free_cache:
		kmem_cache_free(kmem_cache, s);

- but __kmem_cache_create() - at least for slub() - will have done

	sysfs_slab_add(s)
		-> sysfs_create_group() .. fails ..
		-> kobject_del(&s->kobj); .. which frees s ...

We can't remove the kmem_cache_free() in create_cache(), because other error cases of __kmem_cache_create() do not free this.

Quoted 6 lines

So, revert the commit dde3c6b72a16 ("mm/slub: fix a memory leak in sysfs_slab_add()") to fix this.

Reported-by [email protected]
Fixes dde3c6b72a16 ("mm/slub: fix a memory leak in sysfs_slab_add()")

Double-free is worse than a rare small memory leak. Which would still be nice to fix, but I'm afraid it will be more complicated, so start with preventing the worse issue, including stable.

Quoted 21 lines
---
 mm/slub.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
mm/slub.c +1 -3
index 69742ab9a21d..7ecbbbe5bc0c 100644
@@ -5625,10 +5625,8 @@ static int sysfs_slab_add(struct kmem_cache *s)
 
 	s->kobj.kset = kset;
 	err = kobject_init_and_add(&s->kobj, &slab_ktype, NULL, "%s", name);
-	if (err) {
-		kobject_put(&s->kobj);
+	if (err)
 		goto out;
-	}
 
 	err = sysfs_create_group(&s->kobj, &slab_attr_group);
 	if (err)