Skip to content

Commit 757fed1

Browse files
Wang Haitorvalds
authored andcommitted
Revert "mm/slub: fix a memory leak in sysfs_slab_add()"
This reverts commit dde3c6b. 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 dde3c6b ("mm/slub: fix a memory leak in sysfs_slab_add()") to fix this. Reported-by: syzbot+d0bd96b4696c1ef67991@syzkaller.appspotmail.com Fixes: dde3c6b ("mm/slub: fix a memory leak in sysfs_slab_add()") Acked-by: Vlastimil Babka <vbabka@suse.cz> Signed-off-by: Wang Hai <wanghai38@huawei.com> Cc: <stable@vger.kernel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 76c057c commit 757fed1

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

mm/slub.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5625,10 +5625,8 @@ static int sysfs_slab_add(struct kmem_cache *s)
56255625

56265626
s->kobj.kset = kset;
56275627
err = kobject_init_and_add(&s->kobj, &slab_ktype, NULL, "%s", name);
5628-
if (err) {
5629-
kobject_put(&s->kobj);
5628+
if (err)
56305629
goto out;
5631-
}
56325630

56335631
err = sysfs_create_group(&s->kobj, &slab_attr_group);
56345632
if (err)

0 commit comments

Comments
 (0)