aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext2/inode.c
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2016-12-06 18:59:01 -0500
committerJan Kara <jack@suse.cz>2016-12-07 07:03:31 -0500
commitb46dc033818d3293ecc49dc258e2efb603c80bd7 (patch)
tree7ee990bb6aa76991c41d09c3a2a86c4f1acb611c /fs/ext2/inode.c
parentc3b004460d77bf3f980d877be539016f2df4df12 (diff)
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)
1476 inode->i_size |= ((__u64)le32_to_cpu(raw_inode->i_size_high)) << 32; 1476 inode->i_size |= ((__u64)le32_to_cpu(raw_inode->i_size_high)) << 32;
1477 else 1477 else
1478 ei->i_dir_acl = le32_to_cpu(raw_inode->i_dir_acl); 1478 ei->i_dir_acl = le32_to_cpu(raw_inode->i_dir_acl);
1479 if (i_size_read(inode) < 0) {
1480 ret = -EFSCORRUPTED;
1481 goto bad_inode;
1482 }
1479 ei->i_dtime = 0; 1483 ei->i_dtime = 0;
1480 inode->i_generation = le32_to_cpu(raw_inode->i_generation); 1484 inode->i_generation = le32_to_cpu(raw_inode->i_generation);
1481 ei->i_state = 0; 1485 ei->i_state = 0;