Commit af65936a authored by Eric Biggers's avatar Eric Biggers Committed by Richard Weinberger

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: default avatarEric Biggers <ebiggers@google.com>
Acked-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 4afb9996
...@@ -1615,15 +1615,6 @@ static const struct vm_operations_struct ubifs_file_vm_ops = { ...@@ -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) static int ubifs_file_mmap(struct file *file, struct vm_area_struct *vma)
{ {
int err; 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); err = generic_file_mmap(file, vma);
if (err) if (err)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment