Commit a6d85430 authored Oct 09, 2007 by Trond Myklebust Committed by Linus Torvalds Oct 09, 2007

NLM: Fix a memory leak in nlmsvc_testlock



The recent fix for a circular lock dependency unfortunately introduced a
potential memory leak in the event where the call to nlmsvc_lookup_host
fails for some reason.

Thanks to Roel Kluin for spotting this.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent baf14aa1

fs/lockd/svclock.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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);