Linux NFS development
 help / color / mirror / Atom feed
From: Jeff Layton <jlayton@primarydata.com>
To: linux-fsdevel@vger.kernel.org
Cc: bfields@fieldses.org, hch@infradead.org,
	cluster-devel@redhat.com, linux-cifs@vger.kernel.org,
	linux-nfs@vger.kernel.org
Subject: [PATCH 01/10] locks: close potential race in lease_get_mtime
Date: Sat, 23 Aug 2014 10:41:09 -0400	[thread overview]
Message-ID: <1408804878-1331-2-git-send-email-jlayton@primarydata.com> (raw)
In-Reply-To: <1408804878-1331-1-git-send-email-jlayton@primarydata.com>

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>
---
 fs/locks.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/fs/locks.c b/fs/locks.c
index d7e15a256f8f..58ce8897f2e4 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;
-- 
1.9.3


  reply	other threads:[~2014-08-23 14:41 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-23 14:41 [PATCH 00/10] locks/nfsd: internal lease API overhaul Jeff Layton
2014-08-23 14:41 ` Jeff Layton [this message]
2014-08-24 15:48   ` [PATCH 01/10] locks: close potential race in lease_get_mtime Christoph Hellwig
2014-08-25 20:01   ` J. Bruce Fields
2014-08-23 14:41 ` [PATCH 02/10] nfsd: fix potential lease memory leak in nfs4_setlease Jeff Layton
2014-08-24 15:48   ` Christoph Hellwig
2014-08-23 14:41 ` [PATCH 03/10] locks: generic_delete_lease doesn't need a file_lock at all Jeff Layton
2014-08-24  1:27   ` Christoph Hellwig
2014-08-24 10:09     ` Jeff Layton
2014-08-23 14:41 ` [PATCH 04/10] locks: clean up vfs_setlease kerneldoc comments Jeff Layton
2014-08-24 15:51   ` Christoph Hellwig
2014-08-25 20:11     ` J. Bruce Fields
2014-08-23 14:41 ` [PATCH 05/10] nfsd: don't keep a pointer to the lease in nfs4_file Jeff Layton
2014-08-24 15:51   ` Christoph Hellwig
2014-08-23 14:41 ` [PATCH 06/10] locks: plumb an "aux" pointer into the setlease routines Jeff Layton
2014-08-24  1:33   ` Christoph Hellwig
2014-08-24 10:08     ` Jeff Layton
2014-08-24 15:54       ` Christoph Hellwig
2014-08-25 20:28   ` J. Bruce Fields
2014-08-26 10:53     ` Jeff Layton
2014-08-23 14:41 ` [PATCH 07/10] locks: define a lm_setup handler for leases Jeff Layton
2014-08-24 15:58   ` Christoph Hellwig
2014-08-25  1:19     ` Jeff Layton
2014-08-26 13:58       ` Christoph Hellwig
2014-08-23 14:41 ` [PATCH 08/10] locks: move i_lock acquisition into generic_*_lease handlers Jeff Layton
2014-08-24 16:06   ` Christoph Hellwig
2014-08-24 16:11     ` Christoph Hellwig
2014-08-31 14:51       ` Jeff Layton
2014-08-25  1:36     ` Jeff Layton
2014-08-23 14:41 ` [PATCH 09/10] locks: move freeing of leases outside of i_lock Jeff Layton
2014-08-24 16:08   ` Christoph Hellwig
2014-08-25  1:35     ` Jeff Layton
2014-08-23 14:41 ` [PATCH 10/10] locks: update Documentation/filesystems with lease API changes Jeff Layton
2014-08-24 16:10 ` [PATCH 00/10] locks/nfsd: internal lease API overhaul Christoph Hellwig
2014-08-25  1:43   ` Jeff Layton
2014-08-26 13:59     ` Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1408804878-1331-2-git-send-email-jlayton@primarydata.com \
    --to=jlayton@primarydata.com \
    --cc=bfields@fieldses.org \
    --cc=cluster-devel@redhat.com \
    --cc=hch@infradead.org \
    --cc=linux-cifs@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox