Skip to contentSkip to conversation

isofs: Fix access to unallocated memory when reading corrupted filesystem

PATCH New Jan Kara 1 participant 1 message Apr 28, 2008 Isofs filesystem

lore
Share & tools
lore

Jan Kara

author maintainer
#0 lore raw

PATCH 1/1 isofs: Fix access to unallocated memory when reading corrupted filesystem

When directory of isofs is corrupted, we did not check whether length of the name in a directory entry and the lenght of the directory entry itself are consistent. This could lead to possible access beyond the end of buffer when the lenght of the name was too big. Add this sanity check to directory reading code.

Signed-off-by Jan Kara <[email protected]>
---
 fs/isofs/dir.c   |    8 ++++++++
 fs/isofs/namei.c |    7 +++++++
 2 files changed, 15 insertions(+), 0 deletions(-)
fs/isofs/dir.c +8 -0
index 1ba407c..2f0dc5a 100644
@@ -145,6 +145,14 @@ static int do_isofs_readdir(struct inode *inode, struct file *filp,
 			}
 			de = tmpde;
 		}
+		/* Basic sanity check, whether name doesn't exceed dir entry */
+		if (de_len < de->name_len[0] +
+					sizeof(struct iso_directory_record)) {
+			printk(KERN_NOTICE "iso9660: Corrupted directory entry"
+			       " in block %lu of inode %lu\n", block,
+			       inode->i_ino);
+			return -EIO;
+		}
 
 		if (first_de) {
 			isofs_normalize_block_and_offset(de,
fs/isofs/namei.c +7 -0
index 344b247..8299889 100644
@@ -111,6 +111,13 @@ isofs_find_entry(struct inode *dir, struct dentry *dentry,
 
 		dlen = de->name_len[0];
 		dpnt = de->name;
+		/* Basic sanity check, whether name doesn't exceed dir entry */
+		if (de_len < dlen + sizeof(struct iso_directory_record)) {
+			printk(KERN_NOTICE "iso9660: Corrupted directory entry"
+			       " in block %lu of inode %lu\n", block,
+			       dir->i_ino);
+			return 0;
+		}
 
 		if (sbi->s_rock &&
 		    ((i = get_rock_ridge_filename(de, tmpname, dir)))) {
Signature · 1 line
1.5.2.4