diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2010-11-03 21:49:44 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-11-10 20:31:23 +0100 |
| commit | 3df057ac9afe83c4af84016df3baf3a0eb1d3d33 (patch) | |
| tree | ae1d30a596abef618d2913cbead649253fa7acfc | |
| parent | nfsd4: fix 4.1 connection registration race (diff) | |
| download | linux-3df057ac9afe83c4af84016df3baf3a0eb1d3d33.tar.xz linux-3df057ac9afe83c4af84016df3baf3a0eb1d3d33.zip | |
locks: fix leak on merging leases
We must also free the passed-in lease in the case it wasn't used because
an existing lease was upgrade/downgraded or already existed.
Note the nfsd caller doesn't care because it's fl_change callback
returns an error in those cases.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| -rw-r--r-- | fs/locks.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/locks.c b/fs/locks.c index 65765cb6afed..61c22f722050 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1504,7 +1504,7 @@ static int do_fcntl_delete_lease(struct file *filp) static int do_fcntl_add_lease(unsigned int fd, struct file *filp, long arg) { - struct file_lock *fl; + struct file_lock *fl, *ret; struct fasync_struct *new; struct inode *inode = filp->f_path.dentry->d_inode; int error; @@ -1518,6 +1518,7 @@ static int do_fcntl_add_lease(unsigned int fd, struct file *filp, long arg) locks_free_lock(fl); return -ENOMEM; } + ret = fl; lock_flocks(); error = __vfs_setlease(filp, arg, &fl); if (error) { @@ -1525,6 +1526,8 @@ static int do_fcntl_add_lease(unsigned int fd, struct file *filp, long arg) locks_free_lock(fl); goto out_free_fasync; } + if (ret != fl) + locks_free_lock(fl); /* * fasync_insert_entry() returns the old entry if any. @@ -1532,7 +1535,7 @@ static int do_fcntl_add_lease(unsigned int fd, struct file *filp, long arg) * inserted it into the fasync list. Clear new so that * we don't release it here. */ - if (!fasync_insert_entry(fd, filp, &fl->fl_fasync, new)) + if (!fasync_insert_entry(fd, filp, &ret->fl_fasync, new)) new = NULL; if (error < 0) { |