diff options
| author |   Zhihao Cheng <chengzhihao1@huawei.com> | 2022-09-23 21:45:53 +0800 |
|---|---|---|
| committer |   Jan Kara <jack@suse.cz> | 2022-09-29 15:37:28 +0200 |
| commit | 3fc61e0e96a3261aacfd3150fb3a9228f7ce5dd6 (patch) | |
| tree | 252b335bdbaa94cbb157009115ee8542352d2c01 /fs/quota/quota_tree.c | |
| parent | quota: Check next/prev free block number after reading from quota file (diff) | |
| download | linux-dev-3fc61e0e96a3261aacfd3150fb3a9228f7ce5dd6.tar.xz linux-dev-3fc61e0e96a3261aacfd3150fb3a9228f7ce5dd6.zip | |
quota: Replace all block number checking with helper function
Cleanup all block checking places, replace them with helper function
do_check_range().
Link: https://lore.kernel.org/r/20220923134555.2623931-3-chengzhihao1@huawei.com
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/quota/quota_tree.c')
| -rw-r--r-- | fs/quota/quota_tree.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/fs/quota/quota_tree.c b/fs/quota/quota_tree.c index 7e65d67de9f3..0fa73ca28045 100644 --- a/fs/quota/quota_tree.c +++ b/fs/quota/quota_tree.c @@ -518,12 +518,10 @@ static int remove_tree(struct qtree_mem_dqinfo *info, struct dquot *dquot, goto out_buf; } newblk = le32_to_cpu(ref[get_index(info, dquot->dq_id, depth)]); - if (newblk < QT_TREEOFF || newblk >= info->dqi_blocks) { - quota_error(dquot->dq_sb, "Getting block too big (%u >= %u)", - newblk, info->dqi_blocks); - ret = -EUCLEAN; + ret = do_check_range(dquot->dq_sb, "block", newblk, QT_TREEOFF, + info->dqi_blocks - 1); + if (ret) goto out_buf; - } if (depth == info->dqi_qtree_depth - 1) { ret = free_dqentry(info, dquot, newblk); @@ -624,12 +622,10 @@ static loff_t find_tree_dqentry(struct qtree_mem_dqinfo *info, blk = le32_to_cpu(ref[get_index(info, dquot->dq_id, depth)]); if (!blk) /* No reference? */ goto out_buf; - if (blk < QT_TREEOFF || blk >= info->dqi_blocks) { - quota_error(dquot->dq_sb, "Getting block too big (%u >= %u)", - blk, info->dqi_blocks); - ret = -EUCLEAN; + ret = do_check_range(dquot->dq_sb, "block", blk, QT_TREEOFF, + info->dqi_blocks - 1); + if (ret) goto out_buf; - } if (depth < info->dqi_qtree_depth - 1) ret = find_tree_dqentry(info, dquot, blk, depth+1); |