1 files changed, 5 insertions, 0 deletions

diff --git a/fs/hfsplus/catalog.c b/fs/hfsplus/catalog.c
index ba117c445e78..f6874acb2cf2 100644
--- a/fs/hfsplus/catalog.c
+++ b/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);