Skip to content

Commit 7e9c323

Browse files
chaseyutehcaster
authored andcommitted
mm/slub: fix to return errno if kmalloc() fails
In create_unique_id(), kmalloc(, GFP_KERNEL) can fail due to out-of-memory, if it fails, return errno correctly rather than triggering panic via BUG_ON(); kernel BUG at mm/slub.c:5893! Internal error: Oops - BUG: 0 [#1] PREEMPT SMP Call trace: sysfs_slab_add+0x258/0x260 mm/slub.c:5973 __kmem_cache_create+0x60/0x118 mm/slub.c:4899 create_cache mm/slab_common.c:229 [inline] kmem_cache_create_usercopy+0x19c/0x31c mm/slab_common.c:335 kmem_cache_create+0x1c/0x28 mm/slab_common.c:390 f2fs_kmem_cache_create fs/f2fs/f2fs.h:2766 [inline] f2fs_init_xattr_caches+0x78/0xb4 fs/f2fs/xattr.c:808 f2fs_fill_super+0x1050/0x1e0c fs/f2fs/super.c:4149 mount_bdev+0x1b8/0x210 fs/super.c:1400 f2fs_mount+0x44/0x58 fs/f2fs/super.c:4512 legacy_get_tree+0x30/0x74 fs/fs_context.c:610 vfs_get_tree+0x40/0x140 fs/super.c:1530 do_new_mount+0x1dc/0x4e4 fs/namespace.c:3040 path_mount+0x358/0x914 fs/namespace.c:3370 do_mount fs/namespace.c:3383 [inline] __do_sys_mount fs/namespace.c:3591 [inline] __se_sys_mount fs/namespace.c:3568 [inline] __arm64_sys_mount+0x2f8/0x408 fs/namespace.c:3568 Cc: <[email protected]> Fixes: 81819f0 ("SLUB core") Reported-by: [email protected] Reviewed-by: Muchun Song <[email protected]> Reviewed-by: Hyeonggon Yoo <[email protected]> Signed-off-by: Chao Yu <[email protected]> Acked-by: David Rientjes <[email protected]> Signed-off-by: Vlastimil Babka <[email protected]>
1 parent 0495e33 commit 7e9c323

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

mm/slub.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5890,7 +5890,8 @@ static char *create_unique_id(struct kmem_cache *s)
58905890
char *name = kmalloc(ID_STR_LENGTH, GFP_KERNEL);
58915891
char *p = name;
58925892

5893-
BUG_ON(!name);
5893+
if (!name)
5894+
return ERR_PTR(-ENOMEM);
58945895

58955896
*p++ = ':';
58965897
/*
@@ -5948,6 +5949,8 @@ static int sysfs_slab_add(struct kmem_cache *s)
59485949
* for the symlinks.
59495950
*/
59505951
name = create_unique_id(s);
5952+
if (IS_ERR(name))
5953+
return PTR_ERR(name);
59515954
}
59525955

59535956
s->kobj.kset = kset;

0 commit comments

Comments
 (0)