Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f9b12a3 authored by Michael Halcrow's avatar Michael Halcrow Committed by Linus Torvalds
Browse files

eCryptfs: protect crypt_stat->flags in ecryptfs_open() 



Make sure crypt_stat->flags is protected with a lock in ecryptfs_open().

Signed-off-by: default avatarMichael Halcrow <mhalcrow@us.ibm.com>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6a3fd92e

fs/ecryptfs/file.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

	}