diff --git a/[refs] b/[refs]
index a5212980a112..83dfb7a9a34f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: baf14aa14efcfdb5a74d5cf804691086c6bec743
+refs/heads/master: a6d85430424d44e946e0946bfaad607115510989
diff --git a/trunk/fs/lockd/svclock.c b/trunk/fs/lockd/svclock.c
index d098c7af0d22..d120ec39bcb0 100644
--- a/trunk/fs/lockd/svclock.c
+++ b/trunk/fs/lockd/svclock.c
@@ -485,8 +485,10 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file,
 			return nlm_granted;
 		/* Create host handle for callback */
 		host = nlmsvc_lookup_host(rqstp, lock->caller, lock->len);
-		if (host == NULL)
+		if (host == NULL) {
+			kfree(conf);
 			return nlm_lck_denied_nolocks;
+		}
 		block = nlmsvc_create_block(rqstp, host, file, lock, cookie);
 		if (block == NULL) {
 			kfree(conf);