diff options
| author | Michael Halcrow <mhalcrow@us.ibm.com> | 2008-04-29 00:59:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 08:06:07 -0700 |
| commit | 2f9b12a31fcb738ea8c9eb0d4ddf906c6f1d696c (patch) | |
| tree | e6cde843b575c2b29396ee2b66af285da68c5a79 | |
| parent | 6a3fd92e73fffd9e583650c56ad9558afe51dc5c (diff) | |
| download | blackbird-op-linux-2f9b12a31fcb738ea8c9eb0d4ddf906c6f1d696c.tar.gz blackbird-op-linux-2f9b12a31fcb738ea8c9eb0d4ddf906c6f1d696c.zip | |
eCryptfs: protect crypt_stat->flags in ecryptfs_open()
Make sure crypt_stat->flags is protected with a lock in ecryptfs_open().
Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/ecryptfs/file.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c index 2b8f5ed4adea..2258b8f654a6 100644 --- a/fs/ecryptfs/file.c +++ b/fs/ecryptfs/file.c @@ -195,7 +195,9 @@ static int ecryptfs_open(struct inode *inode, struct file *file) file, ecryptfs_inode_to_private(inode)->lower_file); if (S_ISDIR(ecryptfs_dentry->d_inode->i_mode)) { ecryptfs_printk(KERN_DEBUG, "This is a directory\n"); + mutex_lock(&crypt_stat->cs_mutex); crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED); + mutex_unlock(&crypt_stat->cs_mutex); rc = 0; goto out; } |
