diff options
| author | Jeff Layton <jlayton@primarydata.com> | 2014-08-22 16:18:44 +0200 |
|---|---|---|
| committer | Jeff Layton <jlayton@primarydata.com> | 2014-10-07 20:06:12 +0200 |
| commit | bfe8602436c803c6d5e271d52cd985d491a7470a (patch) | |
| tree | 17b28bd50fd22ae65f90e9bd09cc5b14415a0049 /fs/locks.c | |
| parent | security: make security_file_set_fowner, f_setown and __f_setown void return (diff) | |
| download | linux-bfe8602436c803c6d5e271d52cd985d491a7470a.tar.xz linux-bfe8602436c803c6d5e271d52cd985d491a7470a.zip | |
locks: close potential race in lease_get_mtime
lease_get_mtime is called without the i_lock held, so there's no
guarantee about the stability of the list. Between the time when we
assign "flock" and then dereference it to check whether it's a lease
and for write, the lease could be freed.
Ensure that that doesn't occur by taking the i_lock before trying
to check the lease.
Cc: J. Bruce Fields <bfields@fieldses.org>
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/locks.c')
| -rw-r--r-- | fs/locks.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/fs/locks.c b/fs/locks.c index f5f648e003dd..def1ac2e87bd 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1456,8 +1456,18 @@ EXPORT_SYMBOL(__break_lease); */ void lease_get_mtime(struct inode *inode, struct timespec *time) { - struct file_lock *flock = inode->i_flock; - if (flock && IS_LEASE(flock) && (flock->fl_type == F_WRLCK)) + bool has_lease = false; + struct file_lock *flock; + + if (inode->i_flock) { + spin_lock(&inode->i_lock); + flock = inode->i_flock; + if (flock && IS_LEASE(flock) && (flock->fl_type == F_WRLCK)) + has_lease = true; + spin_unlock(&inode->i_lock); + } + + if (has_lease) *time = current_fs_time(inode->i_sb); else *time = inode->i_mtime; |