From 89383705eeca6c2c040ad73a3711d8051c3c4a5b Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Sat, 13 Oct 2007 11:33:50 +0100
Subject: [PATCH] --- yaml --- r: 68537 b: refs/heads/master c:
 69ca4378aa376cf2c49657d4f6951da56c27cd3a h: refs/heads/master i:   68535:
 986b3ba46ac5b1b80458ba7f1ba655910bad9459 v: v3

---
 [refs]                 |  2 +-
 trunk/fs/jffs2/write.c | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7180f72e3334..8b64308c81f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8c68f32644fc8942b25af9239967dd01be621fa
+refs/heads/master: 69ca4378aa376cf2c49657d4f6951da56c27cd3a
diff --git a/trunk/fs/jffs2/write.c b/trunk/fs/jffs2/write.c
index 664c164aa67c..2f5695446d0f 100644
--- a/trunk/fs/jffs2/write.c
+++ b/trunk/fs/jffs2/write.c
@@ -215,6 +215,17 @@ struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff
 		BUG();
 	   });
 
+	if (strnlen(name, namelen) != namelen) {
+		/* This should never happen, but seems to have done on at least one
+		   occasion: https://dev.laptop.org/ticket/4184 */
+		printk(KERN_CRIT "Error in jffs2_write_dirent() -- name contains zero bytes!\n");
+		printk(KERN_CRIT "Directory inode #%u, name at *0x%p \"%s\"->ino #%u, name_crc 0x%08x\n",
+		       je32_to_cpu(rd->pino), name, name, je32_to_cpu(rd->ino),
+		       je32_to_cpu(rd->name_crc));
+		WARN_ON(1);
+		return ERR_PTR(-EIO);
+	}
+
 	vecs[0].iov_base = rd;
 	vecs[0].iov_len = sizeof(*rd);
 	vecs[1].iov_base = (unsigned char *)name;
@@ -226,7 +237,7 @@ struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff
 
 	fd->version = je32_to_cpu(rd->version);
 	fd->ino = je32_to_cpu(rd->ino);
-	fd->nhash = full_name_hash(name, strlen(name));
+	fd->nhash = full_name_hash(name, namelen);
 	fd->type = rd->type;
 	memcpy(fd->name, name, namelen);
 	fd->name[namelen]=0;