From 3a598112c1f0e22feda06537efb2053e7504905e Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 29 Jul 2012 23:17:39 +0400
Subject: [PATCH] --- yaml --- r: 320967 b: refs/heads/master c:
 bf8848918d751c1fb86f6514a75bf8d406f1c3c3 h: refs/heads/master i:   320965:
 6b9a6cffb546cecc66951494d7cb08ad6f252f6b   320963:
 8fa5d5bf0f941ae73e87d4b7469560e1673dd883   320959:
 4e8b1e84b1b915d9dec66d82c10aaec93396cd55 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/lockd/clntproc.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6de7039572f4..ae9590b5a668 100644
--- 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
index 27c74f32671b..05d29124c6ab 100644
--- 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);