openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
J. Bruce Fields 2010-10-30 17:31:14 -04:00 committed by Linus Torvalds
parent 0ceaf6c700
commit 096657b65e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/locks.c
View File

@ -1371,20 +1371,22 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp)
struct inode *inode = dentry->d_inode; struct inode *inode = dentry->d_inode;
int error, rdlease_count = 0, wrlease_count = 0; int error, rdlease_count = 0, wrlease_count = 0;
lease = *flp;
error = -EACCES;
if ((current_fsuid() != inode->i_uid) && !capable(CAP_LEASE)) if ((current_fsuid() != inode->i_uid) && !capable(CAP_LEASE))
return -EACCES; goto out;
error = -EINVAL;
if (!S_ISREG(inode->i_mode)) if (!S_ISREG(inode->i_mode))
return -EINVAL; goto out;
error = security_file_lock(filp, arg); error = security_file_lock(filp, arg);
if (error) if (error)
return error; goto out;
time_out_leases(inode); time_out_leases(inode);
BUG_ON(!(*flp)->fl_lmops->fl_break); BUG_ON(!(*flp)->fl_lmops->fl_break);
lease = *flp;
if (arg != F_UNLCK) { if (arg != F_UNLCK) {
error = -EAGAIN; error = -EAGAIN;
if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0)) if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0))