diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2018-11-07 10:32:53 -0500 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2018-12-01 23:09:40 +0100 |
| commit | 34c29362e04f306065b21330ad169415eb09d4aa (patch) | |
| tree | b7d0e9f5f8351b91ed5f4cfbbb7da198767028c5 | |
| parent | 72f5f9308d3c8d818bfbb349e47bda66bf679852 (diff) | |
ext4: fix possible leak of sbi->s_group_desc_leak in error path
partial merge
commit 9e463084cdb22e0b56b2dfbc50461020409a5fd3 upstream.
Fixes: bfe0a5f47ada ("ext4: add more mount time checks of the superblock")
Reported-by: Vasily Averin <vvs@virtuozzo.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org # 4.18
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Moyster <oysterized@gmail.com>
| -rw-r--r-- | fs/ext4/super.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index bc1160cf3..838d51074 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3631,6 +3631,14 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) sbi->s_groups_count = blocks_count; sbi->s_blockfile_groups = min_t(ext4_group_t, sbi->s_groups_count, (EXT4_MAX_BLOCK_FILE_PHYS / EXT4_BLOCKS_PER_GROUP(sb))); + if (((u64)sbi->s_groups_count * sbi->s_inodes_per_group) != + le32_to_cpu(es->s_inodes_count)) { + ext4_msg(sb, KERN_ERR, "inodes count not valid: %u vs %llu", + le32_to_cpu(es->s_inodes_count), + ((u64)sbi->s_groups_count * sbi->s_inodes_per_group)); + ret = -EINVAL; + goto failed_mount; + } db_count = (sbi->s_groups_count + EXT4_DESC_PER_BLOCK(sb) - 1) / EXT4_DESC_PER_BLOCK(sb); if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_META_BG)) { |