Skip to content

Commit 011568e

Browse files
xiaoleiwang123456tehcaster
authored andcommitted
mm/slab: Fix a kmemleak in kmem_cache_destroy()
For earlier kmem cache creation, slab_sysfs_init() has not been called. Consequently, kmem_cache_destroy() cannot utilize kobj_type::release to release the kmem_cache structure. Therefore, tweak kmem_cache_release() to use slab_kmem_cache_release() for releasing kmem_cache when slab_state isn't FULL. This will fixes the memory leaks like following: unreferenced object 0xffff0000c2d87080 (size 128): comm "swapper/0", pid 1, jiffies 4294893428 hex dump (first 32 bytes): 00 00 00 00 ad 4e ad de ff ff ff ff 6b 6b 6b 6b .....N......kkkk ff ff ff ff ff ff ff ff b8 ab 48 89 00 80 ff ff.....H..... backtrace (crc 8819d0f6): [<ffff80008317a298>] kmemleak_alloc+0xb0/0xc4 [<ffff8000807e553c>] kmem_cache_alloc_node+0x288/0x3a8 [<ffff8000807e95f0>] __kmem_cache_create+0x1e4/0x64c [<ffff8000807216bc>] kmem_cache_create_usercopy+0x1c4/0x2cc [<ffff8000807217e0>] kmem_cache_create+0x1c/0x28 [<ffff8000819f6278>] arm_v7s_alloc_pgtable+0x1c0/0x6d4 [<ffff8000819f53a0>] alloc_io_pgtable_ops+0xe8/0x2d0 [<ffff800084b2d2c4>] arm_v7s_do_selftests+0xe0/0x73c [<ffff800080016b68>] do_one_initcall+0x11c/0x7ac [<ffff800084a71ddc>] kernel_init_freeable+0x53c/0xbb8 [<ffff8000831728d8>] kernel_init+0x24/0x144 [<ffff800080018e98>] ret_from_fork+0x10/0x20 Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com> Reviewed-by: Chengming Zhou <chengming.zhou@linux.dev> Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
1 parent c94d222 commit 011568e

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

mm/slab_common.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,12 @@ EXPORT_SYMBOL(kmem_cache_create);
404404
*/
405405
static void kmem_cache_release(struct kmem_cache *s)
406406
{
407-
sysfs_slab_unlink(s);
408-
sysfs_slab_release(s);
407+
if (slab_state >= FULL) {
408+
sysfs_slab_unlink(s);
409+
sysfs_slab_release(s);
410+
} else {
411+
slab_kmem_cache_release(s);
412+
}
409413
}
410414
#else
411415
static void kmem_cache_release(struct kmem_cache *s)

mm/slub.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6794,14 +6794,12 @@ static int sysfs_slab_add(struct kmem_cache *s)
67946794

67956795
void sysfs_slab_unlink(struct kmem_cache *s)
67966796
{
6797-
if (slab_state >= FULL)
6798-
kobject_del(&s->kobj);
6797+
kobject_del(&s->kobj);
67996798
}
68006799

68016800
void sysfs_slab_release(struct kmem_cache *s)
68026801
{
6803-
if (slab_state >= FULL)
6804-
kobject_put(&s->kobj);
6802+
kobject_put(&s->kobj);
68056803
}
68066804

68076805
/*

0 commit comments

Comments
 (0)