diff --git a/[refs] b/[refs]
index 345b62b474a2..3c2c1a904549 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bfe0b499082fd3950429017cd8ebf2a6c458aa5
+refs/heads/master: 2deb1acc653cbd5384b107d050d2deba089db2bd
diff --git a/trunk/fs/isofs/dir.c b/trunk/fs/isofs/dir.c
index 1ba407c64df1..2f0dc5a14633 100644
--- a/trunk/fs/isofs/dir.c
+++ b/trunk/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,
diff --git a/trunk/fs/isofs/namei.c b/trunk/fs/isofs/namei.c
index 344b247bc29a..8299889a835e 100644
--- a/trunk/fs/isofs/namei.c
+++ b/trunk/fs/isofs/namei.c
@@ -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)))) {