diff options
| author | Jan Kara <jack@suse.cz> | 2015-01-07 13:49:08 +0100 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2016-08-26 20:44:46 +0200 |
| commit | 7b25f2fcd770560cdd1ab2160bcd07cff357315e (patch) | |
| tree | a92c102ea45189b2a7ea1b2912187ba1d8d881b8 /fs/udf | |
| parent | 3cf7c12f718cb5e95711f398a7e67b1daaf6eee5 (diff) | |
udf: Check length of extended attributes and allocation descriptors
commit 23b133bdc452aa441fcb9b82cbf6dd05cfd342d0 upstream.
Check length of extended attributes and allocation descriptors when
loading inodes from disk. Otherwise corrupted filesystems could confuse
the code and make the kernel oops.
Reported-by: Carl Henrik Lunde <chlunde@ping.uio.no>
Cc: stable@vger.kernel.org
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
[Jan and Jiri fixed it in 3.12 stable, i ported it to 3.10 stable,
replaced bs by inode->i_sb->s_blocksize]
Signed-off-by: Zhang Zhen <zhenzhang.zhang@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stefan Guendhoer <stefan@guendhoer.com>
Diffstat (limited to 'fs/udf')
| -rw-r--r-- | fs/udf/inode.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index aa023283c..789814f27 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -1495,6 +1495,16 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh) iinfo->i_checkpoint = le32_to_cpu(efe->checkpoint); } + /* + * Sanity check length of allocation descriptors and extended attrs to + * avoid integer overflows + */ + if (iinfo->i_lenEAttr > inode->i_sb->s_blocksize || iinfo->i_lenAlloc > inode->i_sb->s_blocksize) + return; + /* Now do exact checks */ + if (udf_file_entry_alloc_offset(inode) + iinfo->i_lenAlloc > inode->i_sb->s_blocksize) + return; + switch (fe->icbTag.fileType) { case ICBTAG_FILE_TYPE_DIRECTORY: inode->i_op = &udf_dir_inode_operations; |