Commit a6d85430 authored by Trond Myklebust's avatar Trond Myklebust Committed by Linus Torvalds
Browse files

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: default avatarTrond Myklebust <>
Signed-off-by: default avatarLinus Torvalds <>
parent baf14aa1
......@@ -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) {
return nlm_lck_denied_nolocks;
block = nlmsvc_create_block(rqstp, host, file, lock, cookie);
if (block == NULL) {
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment