From e3a20e216d6f63325394e1b8d90312eb5cd16992 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 25 Jan 2008 23:22:26 -0500
Subject: [PATCH] --- yaml --- r: 84890 b: refs/heads/master c:
 ef58bccab7c7ef34451aa4ceea39545ef126b666 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/fs/dlm/lock.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1bfb7d10e87d..79998e3d5954 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5dd06313dbcec3a2c8a5e4a6f3ddb2a8fc72ec9
+refs/heads/master: ef58bccab7c7ef34451aa4ceea39545ef126b666
diff --git a/trunk/fs/dlm/lock.c b/trunk/fs/dlm/lock.c
index 0593dd81d46d..6d98cf9d043d 100644
--- a/trunk/fs/dlm/lock.c
+++ b/trunk/fs/dlm/lock.c
@@ -436,11 +436,15 @@ static int find_rsb(struct dlm_ls *ls, char *name, int namelen,
 {
 	struct dlm_rsb *r, *tmp;
 	uint32_t hash, bucket;
-	int error = 0;
+	int error = -EINVAL;
+
+	if (namelen > DLM_RESNAME_MAXLEN)
+		goto out;
 
 	if (dlm_no_directory(ls))
 		flags |= R_CREATE;
 
+	error = 0;
 	hash = jhash(name, namelen, 0);
 	bucket = hash & (ls->ls_rsbtbl_size - 1);