Skip to content

Commit 883de6b

Browse files
mjkravetz0day robot
authored andcommitted
hugetlbfs: initialize shared policy as part of inode allocation
Any time after inode allocation, destroy_inode can be called. The hugetlbfs inode contains a shared_policy structure, and mpol_free_shared_policy is unconditionally called as part of hugetlbfs_destroy_inode. Initialize the policy as part of inode allocation so that any quick (error path) calls to destroy_inode will be handed an initialized policy. syzkaller fuzzer found this bug, that resulted in the following: BUG: KASAN: user-memory-access in atomic_inc include/asm-generic/atomic-instrumented.h:87 [inline] at addr 000000131730bd7a BUG: KASAN: user-memory-access in __lock_acquire+0x21a/0x3a80 kernel/locking/lockdep.c:3239 at addr 000000131730bd7a Write of size 4 by task syz-executor6/14086 CPU: 3 PID: 14086 Comm: syz-executor6 Not tainted 4.11.0-rc3+ torvalds#364 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:16 [inline] dump_stack+0x1b8/0x28d lib/dump_stack.c:52 kasan_report_error mm/kasan/report.c:291 [inline] kasan_report.part.2+0x34a/0x480 mm/kasan/report.c:316 kasan_report+0x21/0x30 mm/kasan/report.c:303 check_memory_region_inline mm/kasan/kasan.c:326 [inline] check_memory_region+0x137/0x190 mm/kasan/kasan.c:333 kasan_check_write+0x14/0x20 mm/kasan/kasan.c:344 atomic_inc include/asm-generic/atomic-instrumented.h:87 [inline] __lock_acquire+0x21a/0x3a80 kernel/locking/lockdep.c:3239 lock_acquire+0x1ee/0x590 kernel/locking/lockdep.c:3762 __raw_write_lock include/linux/rwlock_api_smp.h:210 [inline] _raw_write_lock+0x33/0x50 kernel/locking/spinlock.c:295 mpol_free_shared_policy+0x43/0xb0 mm/mempolicy.c:2536 hugetlbfs_destroy_inode+0xca/0x120 fs/hugetlbfs/inode.c:952 alloc_inode+0x10d/0x180 fs/inode.c:216 new_inode_pseudo+0x69/0x190 fs/inode.c:889 new_inode+0x1c/0x40 fs/inode.c:918 hugetlbfs_get_inode+0x40/0x420 fs/hugetlbfs/inode.c:734 hugetlb_file_setup+0x329/0x9f0 fs/hugetlbfs/inode.c:1282 newseg+0x422/0xd30 ipc/shm.c:575 ipcget_new ipc/util.c:285 [inline] ipcget+0x21e/0x580 ipc/util.c:639 SYSC_shmget ipc/shm.c:673 [inline] SyS_shmget+0x158/0x230 ipc/shm.c:657 entry_SYSCALL_64_fastpath+0x1f/0xc2 Analysis provided by Tetsuo Handa <[email protected]> v2: Remove now redundant initialization in hugetlbfs_get_root Reported-by: Dmitry Vyukov <[email protected]> Signed-off-by: Mike Kravetz <[email protected]>
1 parent d038e3d commit 883de6b

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

fs/hugetlbfs/inode.c

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -695,14 +695,11 @@ static struct inode *hugetlbfs_get_root(struct super_block *sb,
695695

696696
inode = new_inode(sb);
697697
if (inode) {
698-
struct hugetlbfs_inode_info *info;
699698
inode->i_ino = get_next_ino();
700699
inode->i_mode = S_IFDIR | config->mode;
701700
inode->i_uid = config->uid;
702701
inode->i_gid = config->gid;
703702
inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
704-
info = HUGETLBFS_I(inode);
705-
mpol_shared_policy_init(&info->policy, NULL);
706703
inode->i_op = &hugetlbfs_dir_inode_operations;
707704
inode->i_fop = &simple_dir_operations;
708705
/* directory inodes start off with i_nlink == 2 (for "." entry) */
@@ -733,23 +730,13 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb,
733730

734731
inode = new_inode(sb);
735732
if (inode) {
736-
struct hugetlbfs_inode_info *info;
737733
inode->i_ino = get_next_ino();
738734
inode_init_owner(inode, dir, mode);
739735
lockdep_set_class(&inode->i_mapping->i_mmap_rwsem,
740736
&hugetlbfs_i_mmap_rwsem_key);
741737
inode->i_mapping->a_ops = &hugetlbfs_aops;
742738
inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
743739
inode->i_mapping->private_data = resv_map;
744-
info = HUGETLBFS_I(inode);
745-
/*
746-
* The policy is initialized here even if we are creating a
747-
* private inode because initialization simply creates an
748-
* an empty rb tree and calls rwlock_init(), later when we
749-
* call mpol_free_shared_policy() it will just return because
750-
* the rb tree will still be empty.
751-
*/
752-
mpol_shared_policy_init(&info->policy, NULL);
753740
switch (mode & S_IFMT) {
754741
default:
755742
init_special_inode(inode, mode, dev);
@@ -937,6 +924,18 @@ static struct inode *hugetlbfs_alloc_inode(struct super_block *sb)
937924
hugetlbfs_inc_free_inodes(sbinfo);
938925
return NULL;
939926
}
927+
928+
/*
929+
* Any time after allocation, hugetlbfs_destroy_inode can be called
930+
* for the inode. mpol_free_shared_policy is unconditionally called
931+
* as part of hugetlbfs_destroy_inode. So, initialize policy here
932+
* in case of a quick call to destroy.
933+
*
934+
* Note that the policy is initialized even if we are creating a
935+
* private inode. This simplifies hugetlbfs_destroy_inode.
936+
*/
937+
mpol_shared_policy_init(&p->policy, NULL);
938+
940939
return &p->vfs_inode;
941940
}
942941

0 commit comments

Comments
 (0)