summaryrefslogtreecommitdiffstats
path: root/fs/ubifs
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2017-05-22 17:39:44 -0700
committerRichard Weinberger <richard@nod.at>2017-07-05 23:52:50 +0200
commitaf65936a7a5bb8ec1d05b2a7670f84ca2014628d (patch)
tree04187325babe531bcdf695863c1a20bf0e21046f /fs/ubifs
parent4afb9996a254a8ec33801f4b33992d45670164b2 (diff)
downloadlinux-af65936a7a5bb8ec1d05b2a7670f84ca2014628d.tar.gz
linux-af65936a7a5bb8ec1d05b2a7670f84ca2014628d.tar.bz2
linux-af65936a7a5bb8ec1d05b2a7670f84ca2014628d.zip
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>
Diffstat (limited to 'fs/ubifs')
-rw-r--r--fs/ubifs/file.c9
1 files changed, 0 insertions, 9 deletions
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)