From: Eric Biggers <ebiggers@google.com>
Date: Tue, 23 May 2017 00:39:44 +0000 (-0700)
Subject: ubifs: don't bother checking for encryption key in ->mmap()
X-Git-Tag: v4.13-rc1~9^2~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af65936a7a5bb8ec1d05b2a7670f84ca2014628d;p=platform%2Fkernel%2Flinux-exynos.git

ubifs: don't bother checking for encryption key in ->mmap()

Since only an open file can be mmap'ed, and we only allow open()ing an
encrypted file when its key is available, there is no need to check for
the key again before permitting each mmap().

Signed-off-by: Eric Biggers <ebiggers@google.com>
Acked-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Richard Weinberger <richard@nod.at>
---

diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index ee3ff4c6bf4a..c1d352842ee2 100644
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -1615,15 +1615,6 @@ static const struct vm_operations_struct ubifs_file_vm_ops = {
 static int ubifs_file_mmap(struct file *file, struct vm_area_struct *vma)
 {
 	int err;
-	struct inode *inode = file->f_mapping->host;
-
-	if (ubifs_crypt_is_encrypted(inode)) {
-		err = fscrypt_get_encryption_info(inode);
-		if (err)
-			return -EACCES;
-		if (!fscrypt_has_encryption_key(inode))
-			return -ENOKEY;
-	}
 
 	err = generic_file_mmap(file, vma);
 	if (err)