diff options
author | Eryu Guan <guaneryu@gmail.com> | 2016-12-01 15:08:37 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-09 02:08:25 -0500 |
commit | 13e6ef99d23b05807e7f8a72f45e3d8260b61570 (patch) | |
tree | 9e310c94b2c4d5442ce6be39d6452a6c6e047d86 /fs | |
parent | 610c2b7ff8f6d5cbad76bbe522f7f367d7116b0f (diff) |
ext4: validate s_first_meta_bg at mount time
commit 3a4b77cd47bb837b8557595ec7425f281f2ca1fe upstream.
Ralf Spenneberg reported that he hit a kernel crash when mounting a
modified ext4 image. And it turns out that kernel crashed when
calculating fs overhead (ext4_calculate_overhead()), this is because
the image has very large s_first_meta_bg (debug code shows it's
842150400), and ext4 overruns the memory in count_overhead() when
setting bitmap buffer, which is PAGE_SIZE.
ext4_calculate_overhead():
buf = get_zeroed_page(GFP_NOFS); <=== PAGE_SIZE buffer
blks = count_overhead(sb, i, buf);
count_overhead():
for (j = ext4_bg_num_gdb(sb, grp); j > 0; j--) { <=== j = 842150400
ext4_set_bit(EXT4_B2C(sbi, s++), buf); <=== buffer overrun
count++;
}
This can be reproduced easily for me by this script:
#!/bin/bash
rm -f fs.img
mkdir -p /mnt/ext4
fallocate -l 16M fs.img
mke2fs -t ext4 -O bigalloc,meta_bg,^resize_inode -F fs.img
debugfs -w -R "ssv first_meta_bg 842150400" fs.img
mount -o loop fs.img /mnt/ext4
Fix it by validating s_first_meta_bg first at mount time, and
refusing to mount if its value exceeds the largest possible meta_bg
number.
Reported-by: Ralf Spenneberg <ralf@os-t.de>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/super.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 478630af0d19..bbc316db9495 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -3827,6 +3827,15 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) | |||
3827 | (EXT4_MAX_BLOCK_FILE_PHYS / EXT4_BLOCKS_PER_GROUP(sb))); | 3827 | (EXT4_MAX_BLOCK_FILE_PHYS / EXT4_BLOCKS_PER_GROUP(sb))); |
3828 | db_count = (sbi->s_groups_count + EXT4_DESC_PER_BLOCK(sb) - 1) / | 3828 | db_count = (sbi->s_groups_count + EXT4_DESC_PER_BLOCK(sb) - 1) / |
3829 | EXT4_DESC_PER_BLOCK(sb); | 3829 | EXT4_DESC_PER_BLOCK(sb); |
3830 | if (ext4_has_feature_meta_bg(sb)) { | ||
3831 | if (le32_to_cpu(es->s_first_meta_bg) >= db_count) { | ||
3832 | ext4_msg(sb, KERN_WARNING, | ||
3833 | "first meta block group too large: %u " | ||
3834 | "(group descriptor block count %u)", | ||
3835 | le32_to_cpu(es->s_first_meta_bg), db_count); | ||
3836 | goto failed_mount; | ||
3837 | } | ||
3838 | } | ||
3830 | sbi->s_group_desc = ext4_kvmalloc(db_count * | 3839 | sbi->s_group_desc = ext4_kvmalloc(db_count * |
3831 | sizeof(struct buffer_head *), | 3840 | sizeof(struct buffer_head *), |
3832 | GFP_KERNEL); | 3841 | GFP_KERNEL); |