Skip to contentSkip to conversation

udf: Check length of extended attributes and allocation descriptors

PATCH New Zhang Zhen 1 participant 3 messages Aug 17, 2015 – Sep 7, 2015 1 message not in the archive

Subsystems (2)
Stable branch UDF filesystem
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Zhang Zhen

author
#1 lore raw

PATCH 1/1 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 <[email protected]>
Cc [email protected]
Signed-off-by Jan Kara <[email protected]>
Signed-off-by Jiri Slaby <[email protected]>

[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 <[email protected]>
---
 fs/udf/inode.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
fs/udf/inode.c +10 -0
index aa02328..789814f 100644
@@ -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;
Signature · 4 lines
1.8.3.4


.
author
#2 lore raw

PATCH 1/1 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 <[email protected]>
Cc [email protected]
Signed-off-by Jan Kara <[email protected]>
Signed-off-by Jiri Slaby <[email protected]>

[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 <[email protected]>
---
 fs/udf/inode.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
fs/udf/inode.c +10 -0
index aa02328..789814f 100644
@@ -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;
Signature · 4 lines
1.8.3.4


.
author
#3 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.

Reported-by Carl Henrik Lunde <[email protected]>
Cc [email protected]
Signed-off-by Jan Kara <[email protected]>
Signed-off-by Jiri Slaby <[email protected]>

[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 <[email protected]>
---
 fs/udf/inode.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
fs/udf/inode.c +10 -0
index aa02328..789814f 100644
@@ -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;
Signature · 4 lines
1.8.3.4


.