aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2017-05-22 20:39:44 -0400
committerRichard Weinberger <richard@nod.at>2017-07-05 17:52:50 -0400
commitaf65936a7a5bb8ec1d05b2a7670f84ca2014628d (patch)
tree04187325babe531bcdf695863c1a20bf0e21046f
parent4afb9996a254a8ec33801f4b33992d45670164b2 (diff)
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>
-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 = {
1615static int ubifs_file_mmap(struct file *file, struct vm_area_struct *vma) 1615static int ubifs_file_mmap(struct file *file, struct vm_area_struct *vma)
1616{ 1616{
1617 int err; 1617 int err;
1618 struct inode *inode = file->f_mapping->host;
1619
1620 if (ubifs_crypt_is_encrypted(inode)) {
1621 err = fscrypt_get_encryption_info(inode);
1622 if (err)
1623 return -EACCES;
1624 if (!fscrypt_has_encryption_key(inode))
1625 return -ENOKEY;
1626 }
1627 1618
1628 err = generic_file_mmap(file, vma); 1619 err = generic_file_mmap(file, vma);
1629 if (err) 1620 if (err)