diff --git a/[refs] b/[refs]
index b954e936c216..9e37664e8d5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81a73719d1bc77774f6ac91e2476f22c56f18baf
+refs/heads/master: efc7ffcb4237f8cb9938909041c4ed38f6e1bf40
diff --git a/trunk/fs/hfsplus/catalog.c b/trunk/fs/hfsplus/catalog.c
index ba117c445e78..f6874acb2cf2 100644
--- a/trunk/fs/hfsplus/catalog.c
+++ b/trunk/fs/hfsplus/catalog.c
@@ -168,6 +168,11 @@ int hfsplus_find_cat(struct super_block *sb, u32 cnid,
 		return -EIO;
 	}
 
+	if (be16_to_cpu(tmp.thread.nodeName.length) > 255) {
+		printk(KERN_ERR "hfs: catalog name length corrupted\n");
+		return -EIO;
+	}
+
 	hfsplus_cat_build_key_uni(fd->search_key, be32_to_cpu(tmp.thread.parentID),
 				 &tmp.thread.nodeName);
 	return hfs_brec_find(fd);