diff options
author | Theodore Ts'o <tytso@mit.edu> | 2018-06-17 00:41:14 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2018-06-17 00:41:14 -0400 |
commit | c37e9e013469521d9adb932d17a1795c139b36db (patch) | |
tree | a7a39bc1259d9c8398817a5c7c05fcc87e8f6bb6 /fs/ext4/inode.c | |
parent | 8bc1379b82b8e809eef77a9fedbb75c6c297be19 (diff) | |
download | linux-c37e9e013469521d9adb932d17a1795c139b36db.tar.gz linux-c37e9e013469521d9adb932d17a1795c139b36db.tar.bz2 linux-c37e9e013469521d9adb932d17a1795c139b36db.zip |
ext4: add more inode number paranoia checks
If there is a directory entry pointing to a system inode (such as a
journal inode), complain and declare the file system to be corrupted.
Also, if the superblock's first inode number field is too small,
refuse to mount the file system.
This addresses CVE-2018-10882.
https://bugzilla.kernel.org/show_bug.cgi?id=200069
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
Diffstat (limited to 'fs/ext4/inode.c')
-rw-r--r-- | fs/ext4/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index c2f4ccb880c4..7d6c10017bdf 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4506,7 +4506,8 @@ static int __ext4_get_inode_loc(struct inode *inode, int inodes_per_block, inode_offset; iloc->bh = NULL; - if (!ext4_valid_inum(sb, inode->i_ino)) + if (inode->i_ino < EXT4_ROOT_INO || + inode->i_ino > le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count)) return -EFSCORRUPTED; iloc->block_group = (inode->i_ino - 1) / EXT4_INODES_PER_GROUP(sb); |