---

yaml --- r: 231734 b: refs/heads/master c: 0abe116 h: refs/heads/master v: v3
git-mirror · Jan 17, 2011 · f30ce2a · f30ce2a
1 parent 147c184
commit f30ce2a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27992890b02d340198a3a22fc210d13684a41564
+refs/heads/master: 0abe1169470571c473ee720c35fe5b3481c46c46
diff --git a/trunk/fs/ecryptfs/file.c b/trunk/fs/ecryptfs/file.c
@@ -199,8 +199,8 @@ static int ecryptfs_open(struct inode *inode, struct file *file)
 			ecryptfs_dentry->d_name.name, rc);
 		goto out_free;
 	}
-	if ((ecryptfs_inode_to_private(inode)->lower_file->f_flags & O_RDONLY)
-	    && !(file->f_flags & O_RDONLY)) {
+	if ((ecryptfs_inode_to_private(inode)->lower_file->f_flags & O_ACCMODE)
+	    == O_RDONLY && (file->f_flags & O_ACCMODE) != O_RDONLY) {
 		rc = -EPERM;
 		printk(KERN_WARNING "%s: Lower persistent file is RO; eCryptfs "
 		       "file must hence be opened RO\n", __func__);