---

yaml --- r: 320967 b: refs/heads/master c: bf88489 h: refs/heads/master i: 320965: 6b9a6cf 320963: 8fa5d5b 320959: 4e8b1e8 v: v3
git-mirror · Jul 29, 2012 · 3a59811 · 3a59811
1 parent 5fbd475
commit 3a59811
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 446945ab9a82515af4b099107eda27050e077c58
+refs/heads/master: bf8848918d751c1fb86f6514a75bf8d406f1c3c3
diff --git a/trunk/fs/lockd/clntproc.c b/trunk/fs/lockd/clntproc.c
@@ -161,6 +161,11 @@ int nlmclnt_proc(struct nlm_host *host, int cmd, struct file_lock *fl)
 		return -ENOMEM;
 
 	nlmclnt_locks_init_private(fl, host);
+	if (!fl->fl_u.nfs_fl.owner) {
+		/* lockowner allocation has failed */
+		nlmclnt_release_call(call);
+		return -ENOMEM;
+	}
 	/* Set up the argument struct */
 	nlmclnt_setlockargs(call, fl);