[PATCH] VFS: Fix memory leak with file leases

 The patch
 http://linux.bkbits.net:8080/linux-2.6/diffs/fs/[email protected]??nav=index.html
 introduced a pretty nasty memory leak in the lease code. When freeing
 the lease, the code in locks_delete_lock() will correctly clean up
 the fasync queue, but when we return to fcntl_setlease(), the freed
 fasync entry will be reinstated.

 This patch ensures that we skip the call to fasync_helper() when we're
 freeing up the lease.

 Signed-off-by: J. Bruce Fields <[email protected]>
 Signed-off-by: Trond Myklebust <[email protected]>

diff --git a/fs/locks.c b/fs/locks.c
index a1e8b2248014c0aa1d7ae8b2766440f753929908..600d1fbe35710e98fb6d9d2d95de816b59f029b8 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1430,7 +1430,7 @@ int fcntl_setlease(unsigned int fd, struct file *filp, long arg)
        lock_kernel();
 
        error = __setlease(filp, arg, &flp);
-       if (error)
+       if (error || arg == F_UNLCK)
                goto out_unlock;
 
        error = fasync_helper(fd, filp, 1, &flp->fl_fasync);