diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-10-09 11:04:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-09 12:38:26 -0700 |
| commit | a6d85430424d44e946e0946bfaad607115510989 (patch) | |
| tree | f324085c0d92fb8ebae928bab3a5f0b480a3bb4a /fs/lockd | |
| parent | baf14aa14efcfdb5a74d5cf804691086c6bec743 (diff) | |
| download | op-kernel-dev-a6d85430424d44e946e0946bfaad607115510989.zip op-kernel-dev-a6d85430424d44e946e0946bfaad607115510989.tar.gz | |
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>
Diffstat (limited to 'fs/lockd')
| -rw-r--r-- | fs/lockd/svclock.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index d098c7a..d120ec39 100644 --- a/fs/lockd/svclock.c +++ b/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); |
