[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]>
cbmeeks · Nov 13, 2005 · dc15ae1 · dc15ae1
1 parent 9e6c67f
commit dc15ae1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);