diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2016-11-18 19:37:47 +0100 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2016-11-18 19:37:47 +0100 |
| commit | c48ae41bafe31e9a66d8be2ced4e42a6b57fa814 (patch) | |
| tree | 5bce12d4855399ea72f2b89dc108ab4e1c45a556 /fs/ext4 | |
| parent | ext4: use more strict checks for inodes_per_block on mount (diff) | |
| download | linux-c48ae41bafe31e9a66d8be2ced4e42a6b57fa814.tar.xz linux-c48ae41bafe31e9a66d8be2ced4e42a6b57fa814.zip | |
ext4: add sanity checking to count_overhead()
The commit "ext4: sanity check the block and cluster size at mount
time" should prevent any problems, but in case the superblock is
modified while the file system is mounted, add an extra safety check
to make sure we won't overrun the allocated buffer.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/super.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 689c02df1af4..2d8a49d74f56 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3195,10 +3195,15 @@ static int count_overhead(struct super_block *sb, ext4_group_t grp, ext4_set_bit(s++, buf); count++; } - for (j = ext4_bg_num_gdb(sb, grp); j > 0; j--) { - ext4_set_bit(EXT4_B2C(sbi, s++), buf); - count++; + j = ext4_bg_num_gdb(sb, grp); + if (s + j > EXT4_BLOCKS_PER_GROUP(sb)) { + ext4_error(sb, "Invalid number of block group " + "descriptor blocks: %d", j); + j = EXT4_BLOCKS_PER_GROUP(sb) - s; } + count += j; + for (; j > 0; j--) + ext4_set_bit(EXT4_B2C(sbi, s++), buf); } if (!count) return 0; |