| Message ID | 20140718225348.31374.59045.stgit@birch.djwong.org |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Fri, Jul 18, 2014 at 03:53:48PM -0700, Darrick J. Wong wrote: > Since fs->group_desc_count is the number of block groups, the number > of the last group is always one less than this count. Fix the bounds > check to reflect that. > > This flaw shouldn't have any user-visible side effects, since the > block bitmap test based on last_grp later on can handle overbig block > numbers. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Thanks, applied. - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c index 5ad7fe5..eec93c3 100644 --- a/e2fsck/pass1.c +++ b/e2fsck/pass1.c @@ -2916,8 +2916,8 @@ static void new_table_block(e2fsck_t ctx, blk64_t first_block, dgrp_t group, first_block = ext2fs_group_first_block2(fs, flexbg_size * flexbg); last_grp = group | (flexbg_size - 1); - if (last_grp > fs->group_desc_count) - last_grp = fs->group_desc_count; + if (last_grp >= fs->group_desc_count) + last_grp = fs->group_desc_count - 1; last_block = ext2fs_group_last_block2(fs, last_grp); } else last_block = ext2fs_group_last_block2(fs, group);
Since fs->group_desc_count is the number of block groups, the number of the last group is always one less than this count. Fix the bounds check to reflect that. This flaw shouldn't have any user-visible side effects, since the block bitmap test based on last_grp later on can handle overbig block numbers. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- e2fsck/pass1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html