diff --git a/[refs] b/[refs]
index b4f1dfcff680..e795b185fa9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9cc9159281d44754f621f75d4efad0076b29db4
+refs/heads/master: 043b19cdc081f586a8f4e1c93ce6c03b63c26284
diff --git a/trunk/fs/dlm/dir.c b/trunk/fs/dlm/dir.c
index 831050e5bfd5..85defeb64df4 100644
--- a/trunk/fs/dlm/dir.c
+++ b/trunk/fs/dlm/dir.c
@@ -319,6 +319,9 @@ static int get_entry(struct dlm_ls *ls, int nodeid, char *name,
 
 	write_unlock(&ls->ls_dirtbl[bucket].lock);
 
+	if (namelen > DLM_RESNAME_MAXLEN)
+		return -EINVAL;
+
 	de = kzalloc(sizeof(struct dlm_direntry) + namelen, GFP_KERNEL);
 	if (!de)
 		return -ENOMEM;