summaryrefslogtreecommitdiffstats
path: root/fs/ext2/inode.c
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2016-12-07 00:59:01 +0100
committerJan Kara <jack@suse.cz>2016-12-07 13:03:31 +0100
commitb46dc033818d3293ecc49dc258e2efb603c80bd7 (patch)
tree7ee990bb6aa76991c41d09c3a2a86c4f1acb611c /fs/ext2/inode.c
parentquota: Remove dqonoff_mutex (diff)
downloadlinux-b46dc033818d3293ecc49dc258e2efb603c80bd7.tar.xz
linux-b46dc033818d3293ecc49dc258e2efb603c80bd7.zip
ext2: reject inodes with negative size
Don't load an inode with a negative size; this causes integer overflow problems in the VFS. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext2/inode.c')
-rw-r--r--fs/ext2/inode.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 41b8b44a391c..01f6d4be7f9a 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -1476,6 +1476,10 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
inode->i_size |= ((__u64)le32_to_cpu(raw_inode->i_size_high)) << 32;
else
ei->i_dir_acl = le32_to_cpu(raw_inode->i_dir_acl);
+ if (i_size_read(inode) < 0) {
+ ret = -EFSCORRUPTED;
+ goto bad_inode;
+ }
ei->i_dtime = 0;
inode->i_generation = le32_to_cpu(raw_inode->i_generation);
ei->i_state = 0;