Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e35c4da authored by Eric Biggers's avatar Eric Biggers Committed by Richard Weinberger
Browse files

ubifs: switch to fscrypt_file_open() 



Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent f50629df

fs/ubifs/file.c

+1 −30
Original line number Diff line number Diff line
@@ -1629,35 +1629,6 @@ static int ubifs_file_mmap(struct file *file, struct vm_area_struct *vma) 
	return 0;

}



static int ubifs_file_open(struct inode *inode, struct file *filp)

{

	int ret;

	struct dentry *dir;

	struct ubifs_info *c = inode->i_sb->s_fs_info;



	if (ubifs_crypt_is_encrypted(inode)) {

		ret = fscrypt_get_encryption_info(inode);

		if (ret)

			return -EACCES;

		if (!fscrypt_has_encryption_key(inode))

			return -ENOKEY;

	}



	dir = dget_parent(file_dentry(filp));

	if (ubifs_crypt_is_encrypted(d_inode(dir)) &&

			!fscrypt_has_permitted_context(d_inode(dir), inode)) {

		ubifs_err(c, "Inconsistent encryption contexts: %lu/%lu",

			  (unsigned long) d_inode(dir)->i_ino,

			  (unsigned long) inode->i_ino);

		dput(dir);

		ubifs_ro_mode(c, -EPERM);

		return -EPERM;

	}

	dput(dir);



	return 0;

}



static const char *ubifs_get_link(struct dentry *dentry,

					    struct inode *inode,

					    struct delayed_call *done)
@@ -1746,7 +1717,7 @@ const struct file_operations ubifs_file_operations = { 
	.unlocked_ioctl = ubifs_ioctl,

	.splice_read	= generic_file_splice_read,

	.splice_write	= iter_file_splice_write,

	.open		= ubifs_file_open,

	.open		= fscrypt_file_open,

#ifdef CONFIG_COMPAT

	.compat_ioctl   = ubifs_compat_ioctl,

#endif