Skip to content

Commit f7e942b

Browse files
ChenXiaoSongkdave
authored andcommitted
btrfs: qgroup: fix sleep from invalid context bug in btrfs_qgroup_inherit()
Syzkaller reported BUG as follows: BUG: sleeping function called from invalid context at include/linux/sched/mm.h:274 Call Trace: <TASK> dump_stack_lvl+0xcd/0x134 __might_resched.cold+0x222/0x26b kmem_cache_alloc+0x2e7/0x3c0 update_qgroup_limit_item+0xe1/0x390 btrfs_qgroup_inherit+0x147b/0x1ee0 create_subvol+0x4eb/0x1710 btrfs_mksubvol+0xfe5/0x13f0 __btrfs_ioctl_snap_create+0x2b0/0x430 btrfs_ioctl_snap_create_v2+0x25a/0x520 btrfs_ioctl+0x2a1c/0x5ce0 __x64_sys_ioctl+0x193/0x200 do_syscall_64+0x35/0x80 Fix this by calling qgroup_dirty() on @dstqgroup, and update limit item in btrfs_run_qgroups() later outside of the spinlock context. CC: [email protected] # 4.9+ Reviewed-by: Qu Wenruo <[email protected]> Signed-off-by: ChenXiaoSong <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent a11452a commit f7e942b

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

fs/btrfs/qgroup.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2951,14 +2951,7 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid,
29512951
dstgroup->rsv_rfer = inherit->lim.rsv_rfer;
29522952
dstgroup->rsv_excl = inherit->lim.rsv_excl;
29532953

2954-
ret = update_qgroup_limit_item(trans, dstgroup);
2955-
if (ret) {
2956-
qgroup_mark_inconsistent(fs_info);
2957-
btrfs_info(fs_info,
2958-
"unable to update quota limit for %llu",
2959-
dstgroup->qgroupid);
2960-
goto unlock;
2961-
}
2954+
qgroup_dirty(fs_info, dstgroup);
29622955
}
29632956

29642957
if (srcid) {

0 commit comments

Comments
 (0)