lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs: fix missing check in the btrfs_qgroup_inherit()

Browse Source 
The original code forgot to check 'inherit', we should
gurantee that all the qgroups in the struct 'inherit' exist.

Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
Reviewed-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
This commit is contained in:
Wang Shilong
2013-04-07 10:50:19 +00:00
committed by Josef Bacik
parent b7fef4f593
commit 3f5e2d3b38
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fs/btrfs/qgroup.c
View File

@@ -1412,6 +1412,7 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
struct btrfs_qgroup *srcgroup; struct btrfs_qgroup *srcgroup;
struct btrfs_qgroup *dstgroup; struct btrfs_qgroup *dstgroup;
u32 level_size = 0; u32 level_size = 0;
u64 nums;
mutex_lock(&fs_info->qgroup_ioctl_lock); mutex_lock(&fs_info->qgroup_ioctl_lock);
if (!fs_info->quota_enabled) if (!fs_info->quota_enabled)
@@ -1422,6 +1423,20 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
goto out; goto out;
} }
if (inherit) {
i_qgroups = (u64 *)(inherit + 1);
nums = inherit->num_qgroups + 2 * inherit->num_ref_copies +
2 * inherit->num_excl_copies;
for (i = 0; i < nums; ++i) {
srcgroup = find_qgroup_rb(fs_info, *i_qgroups);
if (!srcgroup) {
ret = -EINVAL;
goto out;
}
++i_qgroups;
}
}
/* /*
* create a tracking group for the subvol itself * create a tracking group for the subvol itself
*/ */