X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fisofs%2Fdir.c;h=2f0dc5a1463306adcecc3296a8cf6b01defb7fe3;hb=de6bf18e9ce0df807dab08cff08751cac383429d;hp=1ba407c64df1fed39edbe1470538dd49da171a61;hpb=d9ff963801e4f7648c55a27413a1b1de59480a30;p=linux-2.6

diff --git a/fs/isofs/dir.c b/fs/isofs/dir.c
index 1ba407c64d..2f0dc5a146 100644
--- a/fs/isofs/dir.c
+++ b/fs/isofs/dir.c
@@ -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,