Commit 42e49608683ab25fbbbf9c40edb944601e543882

Authored by Wu Fengguang
Committed by Linus Torvalds
1 parent 85f1fb72fa

vfs: take f_lock on modifying f_mode after open time

We'll introduce FMODE_RANDOM which will be runtime modified.  So protect
all runtime modification to f_mode with f_lock to avoid races.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: <stable@kernel.org>			[2.6.33.x]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 4 additions and 0 deletions Side-by-side Diff

... ... @@ -393,7 +393,9 @@
393 393 continue;
394 394 if (!(f->f_mode & FMODE_WRITE))
395 395 continue;
  396 + spin_lock(&f->f_lock);
396 397 f->f_mode &= ~FMODE_WRITE;
  398 + spin_unlock(&f->f_lock);
397 399 if (file_check_writeable(f) != 0)
398 400 continue;
399 401 file_release_write(f);
... ... @@ -1998,7 +1998,9 @@
1998 1998 {
1999 1999 if (share_access & NFS4_SHARE_ACCESS_WRITE) {
2000 2000 drop_file_write_access(filp);
  2001 + spin_lock(&filp->f_lock);
2001 2002 filp->f_mode = (filp->f_mode | FMODE_READ) & ~FMODE_WRITE;
  2003 + spin_unlock(&filp->f_lock);
2002 2004 }
2003 2005 }
2004 2006