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

Commit 8074bb51 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs crypto: sync ext4_lookup and ext4_file_open 



This patch tries to catch up with lookup and open policies in ext4.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 0b81d077

fs/f2fs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -855,7 +855,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx) 


	if (f2fs_encrypted_inode(inode)) {

		err = fscrypt_get_encryption_info(inode);

		if (err)

		if (err && err != -ENOKEY)

			return err;



		err = fscrypt_fname_alloc_buffer(inode, F2FS_NAME_LEN, &fstr);

fs/f2fs/file.c

+4 −0
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ static int f2fs_file_mmap(struct file *file, struct vm_area_struct *vma) 
static int f2fs_file_open(struct inode *inode, struct file *filp)

{

	int ret = generic_file_open(inode, filp);

	struct inode *dir = filp->f_path.dentry->d_parent->d_inode;



	if (!ret && f2fs_encrypted_inode(inode)) {

		ret = fscrypt_get_encryption_info(inode);
@@ -449,6 +450,9 @@ static int f2fs_file_open(struct inode *inode, struct file *filp) 
		if (!fscrypt_has_encryption_key(inode))

			return -ENOKEY;

	}

	if (f2fs_encrypted_inode(dir) &&

			!fscrypt_has_permitted_context(dir, inode))

		return -EPERM;

	return ret;

}

fs/f2fs/namei.c

+23 −0
Original line number Diff line number Diff line
@@ -262,6 +262,21 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry, 
	int err = 0;

	unsigned int root_ino = F2FS_ROOT_INO(F2FS_I_SB(dir));



	if (f2fs_encrypted_inode(dir)) {

		int res = fscrypt_get_encryption_info(dir);



		/*

		 * DCACHE_ENCRYPTED_WITH_KEY is set if the dentry is

		 * created while the directory was encrypted and we

		 * don't have access to the key.

		 */

		if (fscrypt_has_encryption_key(dir))

			fscrypt_set_encrypted_dentry(dentry);

		fscrypt_set_d_op(dentry);

		if (res && res != -ENOKEY)

			return ERR_PTR(res);

	}



	if (dentry->d_name.len > F2FS_NAME_LEN)

		return ERR_PTR(-ENAMETOOLONG);
@@ -288,6 +303,14 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry, 
		if (err)

			goto err_out;

	}

	if (!IS_ERR(inode) && f2fs_encrypted_inode(dir) &&

			(S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)) &&

			!fscrypt_has_permitted_context(dir, inode)) {

		bool nokey = f2fs_encrypted_inode(inode) &&

			!fscrypt_has_encryption_key(inode);

		iput(inode);

		return nokey ? ERR_PTR(-ENOKEY) : ERR_PTR(-EPERM);

	}

	return d_splice_alias(inode, dentry);



err_out: