diff --git a/[refs] b/[refs]
index 4b17e827f8a4..876df858acee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e62e8c2c7b1e3387d73ecb3f7539314b7a9931e
+refs/heads/master: 373d5e71833978fe3d91264d86857762bb92cfe2
diff --git a/trunk/fs/jffs2/dir.c b/trunk/fs/jffs2/dir.c
index 8bc7a5018e40..f92840a3a52f 100644
--- a/trunk/fs/jffs2/dir.c
+++ b/trunk/fs/jffs2/dir.c
@@ -78,6 +78,9 @@ static struct dentry *jffs2_lookup(struct inode *dir_i, struct dentry *target,
 
 	D1(printk(KERN_DEBUG "jffs2_lookup()\n"));
 
+	if (target->d_name.len > JFFS2_MAX_NAME_LEN)
+		return ERR_PTR(-ENAMETOOLONG);
+
 	dir_f = JFFS2_INODE_INFO(dir_i);
 	c = JFFS2_SB_INFO(dir_i->i_sb);