Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a6d85430424d44e946e0946bfaad607115510989
Commit:     a6d85430424d44e946e0946bfaad607115510989
Parent:     baf14aa14efcfdb5a74d5cf804691086c6bec743
Author:     Trond Myklebust <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 9 11:04:57 2007 -0400
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 12:38:26 2007 -0700

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 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..d120ec3 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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to