[16/25] f2fs: switch to fscrypt_file_open()

Message ID	20170920224605.22030-17-ebiggers3@gmail.com
State	Not Applicable
Headers	show Return-Path: <linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> From: Eric Biggers <ebiggers3@gmail.com> To: linux-fscrypt@vger.kernel.org Subject: [PATCH 16/25] f2fs: switch to fscrypt_file_open() Date: Wed, 20 Sep 2017 15:45:56 -0700 Message-Id: <20170920224605.22030-17-ebiggers3@gmail.com> In-Reply-To: <20170920224605.22030-1-ebiggers3@gmail.com> References: <20170920224605.22030-1-ebiggers3@gmail.com> summary: Content analysis details: (-1.8 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c00:0:0:0:244 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (ebiggers3[at]gmail.com) 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (ebiggers3[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Precedence: list Cc: "Theodore Y . Ts'o" <tytso@mit.edu>, Eric Biggers <ebiggers@google.com>, Michael Halcrow <mhalcrow@google.com>, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, Jaegeuk Kim <jaegeuk@kernel.org>, linux-ext4@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" <linux-mtd-bounces@lists.infradead.org> Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org
Series	fscrypt: add some higher-level helper functions \| expand [00/25] fscrypt: add some higher-level helper functions [01/25] fs, fscrypt: add an S_ENCRYPTED inode flag [02/25] fscrypt: switch from ->is_encrypted() to IS_ENCRYPTED() [03/25] fscrypt: remove ->is_encrypted() [04/25] fscrypt: remove unneeded empty fscrypt_operations structs [05/25] fscrypt: new helper function - fscrypt_require_key() [06/25] fscrypt: new helper function - fscrypt_file_open() [07/25] fscrypt: new helper function - fscrypt_prepare_link() [08/25] fscrypt: new helper function - fscrypt_prepare_rename() [09/25] fscrypt: new helper function - fscrypt_prepare_lookup() [10/25] fscrypt: new helper function - fscrypt_prepare_setattr() [11/25] ext4: switch to fscrypt_file_open() [12/25] ext4: switch to fscrypt_prepare_link() [13/25] ext4: switch to fscrypt_prepare_rename() [14/25] ext4: switch to fscrypt_prepare_lookup() [15/25] ext4: switch to fscrypt_prepare_setattr() [16/25] f2fs: switch to fscrypt_file_open() [17/25] f2fs: switch to fscrypt_prepare_link() [18/25] f2fs: switch to fscrypt_prepare_rename() [19/25] f2fs: switch to fscrypt_prepare_lookup() [20/25] f2fs: switch to fscrypt_prepare_setattr() [21/25] ubifs: switch to fscrypt_file_open() [22/25] ubifs: switch to fscrypt_prepare_link() [23/25] ubifs: switch to fscrypt_prepare_rename() [24/25] ubifs: switch to fscrypt_prepare_lookup() [25/25] ubifs: switch to fscrypt_prepare_setattr()

Message ID

20170920224605.22030-17-ebiggers3@gmail.com

State

Not Applicable

Headers

From: Eric Biggers <ebiggers3@gmail.com>
To: linux-fscrypt@vger.kernel.org
Subject: [PATCH 16/25] f2fs: switch to fscrypt_file_open()
Date: Wed, 20 Sep 2017 15:45:56 -0700
Message-Id: <20170920224605.22030-17-ebiggers3@gmail.com>
In-Reply-To: <20170920224605.22030-1-ebiggers3@gmail.com>
References: <20170920224605.22030-1-ebiggers3@gmail.com>
Precedence: list
Cc: "Theodore Y . Ts'o" <tytso@mit.edu>, Eric Biggers <ebiggers@google.com>, 
	Michael Halcrow <mhalcrow@google.com>,
	linux-f2fs-devel@lists.sourceforge.net, 
	linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org,
	Jaegeuk Kim <jaegeuk@kernel.org>, linux-ext4@vger.kernel.org
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "linux-mtd" <linux-mtd-bounces@lists.infradead.org>
Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org

Series

fscrypt: add some higher-level helper functions | expand

Commit Message

Eric Biggers Sept. 20, 2017, 10:45 p.m. UTC

From: Eric Biggers <ebiggers@google.com>

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 fs/f2fs/file.c | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 517e112c8a9a..8cef3931a00b 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -455,22 +455,10 @@  static int f2fs_file_mmap(struct file *file, struct vm_area_struct *vma)
 
 static int f2fs_file_open(struct inode *inode, struct file *filp)
 {
-	struct dentry *dir;
+	int err = fscrypt_file_open(inode, filp);
 
-	if (f2fs_encrypted_inode(inode)) {
-		int ret = fscrypt_get_encryption_info(inode);
-		if (ret)
-			return -EACCES;
-		if (!fscrypt_has_encryption_key(inode))
-			return -ENOKEY;
-	}
-	dir = dget_parent(file_dentry(filp));
-	if (f2fs_encrypted_inode(d_inode(dir)) &&
-			!fscrypt_has_permitted_context(d_inode(dir), inode)) {
-		dput(dir);
-		return -EPERM;
-	}
-	dput(dir);
+	if (err)
+		return err;
 	return dquot_file_open(inode, filp);
 }

[16/25] f2fs: switch to fscrypt_file_open()

Commit Message

Patch