diff options
| author | Jan Kara <jack@suse.cz> | 2014-12-19 12:03:53 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2014-12-19 13:13:05 +0100 |
| commit | e159332b9af4b04d882dbcfe1bb0117f0a6d4b58 (patch) | |
| tree | 41070fd80f9e4a05ca0ab438814110edb8019869 /fs | |
| parent | 4e2024624e678f0ebb916e6192bd23c1f9fdf696 (diff) | |
| download | linux-e159332b9af4b04d882dbcfe1bb0117f0a6d4b58.tar.gz linux-e159332b9af4b04d882dbcfe1bb0117f0a6d4b58.tar.bz2 linux-e159332b9af4b04d882dbcfe1bb0117f0a6d4b58.zip | |
udf: Verify i_size when loading inode
Verify that inode size is sane when loading inode with data stored in
ICB. Otherwise we may get confused later when working with the inode and
inode size is too big.
CC: stable@vger.kernel.org
Reported-by: Carl Henrik Lunde <chlunde@ping.uio.no>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/udf/inode.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index c9b4df5810d5..5bc71d9a674a 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -1489,6 +1489,20 @@ reread: } inode->i_generation = iinfo->i_unique; + /* Sanity checks for files in ICB so that we don't get confused later */ + if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) { + /* + * For file in ICB data is stored in allocation descriptor + * so sizes should match + */ + if (iinfo->i_lenAlloc != inode->i_size) + goto out; + /* File in ICB has to fit in there... */ + if (inode->i_size > inode->i_sb->s_blocksize - + udf_file_entry_alloc_offset(inode)) + goto out; + } + switch (fe->icbTag.fileType) { case ICBTAG_FILE_TYPE_DIRECTORY: inode->i_op = &udf_dir_inode_operations; |