Skip to contentSkip to conversation

udf: Check length of extended attributes and allocation descriptors

PATCH In review Charles (Chas) Williams 2 participants 2 messages Sep 3, 2015 – Sep 29, 2015 Stable branch

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 udf: Check length of extended attributes and allocation descriptors

From: Jan Kara <[email protected]>

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.

This fixes CVE-2015-4167.

[Use make_bad_inode() instead of branching due to older implementation.]
---
 fs/udf/inode.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
fs/udf/inode.c +16 -0
index 287cd5f..142d29e 100644
@@ -1496,6 +1496,22 @@ 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) {
+		make_bad_inode(inode);
+		return;
+	}
+	/* Now do exact checks */
+	if (udf_file_entry_alloc_offset(inode)
+			+ iinfo->i_lenAlloc > inode->i_sb->s_blocksize) {
+		make_bad_inode(inode);
+		return;
+	}
+
 	switch (fe->icbTag.fileType) {
 	case ICBTAG_FILE_TYPE_DIRECTORY:
 		inode->i_op = &udf_dir_inode_operations;
Signature · 1 line
2.1.0
#1 lore raw
Quoted 8 lines · Charles (Chas) Williams

From: Jan Kara <[email protected]>

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.

Quoted 7 lines

This fixes CVE-2015-4167.

[Use make_bad_inode() instead of branching due to older implementation.]

Thanks for this, now applied.

greg k-h