Commit 66e0aaad authored Jun 23, 2017 by Eric Biggers Committed by Theodore Ts'o Jun 23, 2017

ext4: 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>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

parent 1ea1516f

fs/ext4/file.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -345,13 +345,6 @@ static int ext4_file_mmap(struct file file, struct vm_area_struct vma)
		if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb))))
		return -EIO;

		if (ext4_encrypted_inode(inode)) {
		int err = fscrypt_get_encryption_info(inode);
		if (err)
		return 0;
		if (!fscrypt_has_encryption_key(inode))
		return -ENOKEY;
		}
		file_accessed(file);
		if (IS_DAX(file_inode(file))) {
		vma->vm_ops = &ext4_dax_vm_ops;

Admin message