diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2016-12-10 09:55:01 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-03-16 02:26:33 +0000 |
| commit | 1bd9b8e017f73f41588348a947bd7e81f93b3da3 (patch) | |
| tree | 7e058f973b0261c5a1fab203b03444ac7fa9b29c /fs | |
| parent | 337547ca7f4b301d488266110acd57ecc45ddad4 (diff) | |
| download | linux-stable-1bd9b8e017f73f41588348a947bd7e81f93b3da3.tar.gz linux-stable-1bd9b8e017f73f41588348a947bd7e81f93b3da3.tar.bz2 linux-stable-1bd9b8e017f73f41588348a947bd7e81f93b3da3.zip | |
ext4: reject inodes with negative size
commit 7e6e1ef48fc02f3ac5d0edecbb0c6087cd758d58 upstream.
Don't load an inode with a negative size; this causes integer overflow
problems in the VFS.
[ Added EXT4_ERROR_INODE() to mark file system as corrupted. -TYT]
Fixes: a48380f769df (ext4: rename i_dir_acl to i_size_high)
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
[bwh: Backported to 3.16: use EIO instead of EFSCORRUPTED]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/inode.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index c37dd715060f..898e9659ebf1 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4118,6 +4118,7 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) struct inode *inode; journal_t *journal = EXT4_SB(sb)->s_journal; long ret; + loff_t size; int block; uid_t i_uid; gid_t i_gid; @@ -4209,6 +4210,11 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) ei->i_file_acl |= ((__u64)le16_to_cpu(raw_inode->i_file_acl_high)) << 32; inode->i_size = ext4_isize(raw_inode); + if ((size = i_size_read(inode)) < 0) { + EXT4_ERROR_INODE(inode, "bad i_size value: %lld", size); + ret = -EIO; + goto bad_inode; + } ei->i_disksize = inode->i_size; #ifdef CONFIG_QUOTA ei->i_reserved_quota = 0; |