Messages in this thread Patch in this message | | | Date | Sun, 13 Sep 2015 00:56:20 +0200 | From | Willy Tarreau <> | Subject | [PATCH 2.6.32 14/62] udf: Check length of extended attributes and allocation descriptors |
| |
2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <jack@suse.cz>
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> Signed-off-by: Jan Kara <jack@suse.cz> [bwh: Backported to 2.6.32: use make_bad_inode() instead of returning error] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
CVE-2015-4167
Signed-off-by: Willy Tarreau <w@1wt.eu> --- fs/udf/inode.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 26b7f31..b8d7a0e 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -1284,6 +1284,19 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh) iinfo->i_lenEAttr; } + /* + * Sanity check length of allocation descriptors and extended attrs to + * avoid integer overflows + */ + if (iinfo->i_lenEAttr > bs || iinfo->i_lenAlloc > bs) { + make_bad_inode(inode); + return; + } + /* Now do exact checks */ + if (udf_file_entry_alloc_offset(inode) + iinfo->i_lenAlloc > bs) { + make_bad_inode(inode); + return; + } /* Sanity checks for files in ICB so that we don't get confused later */ if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) { /* -- 1.7.12.2.21.g234cd45.dirty
| |