diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2010-10-30 23:31:14 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-31 02:08:15 +0100 |
| commit | 096657b65e1ac197e20be5ce7cff6b6ca2532787 (patch) | |
| tree | 61265f8d8075aee437597ffe050f339b207356e7 /fs | |
| parent | locks: prevent ENOMEM on lease unlock (diff) | |
| download | linux-096657b65e1ac197e20be5ce7cff6b6ca2532787.tar.xz linux-096657b65e1ac197e20be5ce7cff6b6ca2532787.zip | |
locks: fix leaks on setlease errors
We're depending on setlease to free the passed-in lease on failure.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/locks.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/locks.c b/fs/locks.c index 06c77734f589..63fbc41cc573 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1371,20 +1371,22 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) struct inode *inode = dentry->d_inode; int error, rdlease_count = 0, wrlease_count = 0; + lease = *flp; + + error = -EACCES; if ((current_fsuid() != inode->i_uid) && !capable(CAP_LEASE)) - return -EACCES; + goto out; + error = -EINVAL; if (!S_ISREG(inode->i_mode)) - return -EINVAL; + goto out; error = security_file_lock(filp, arg); if (error) - return error; + goto out; time_out_leases(inode); BUG_ON(!(*flp)->fl_lmops->fl_break); - lease = *flp; - if (arg != F_UNLCK) { error = -EAGAIN; if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0)) |