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

Commit ec86c1ca authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Greg Kroah-Hartman
Browse files

f2fs: don't allow encrypted operations without keys 



commit 363fa4e078cbdc97a172c19d19dc04b41b52ebc8 upstream.

This patch fixes the renaming bug on encrypted filenames, which was pointed by

 (ext4: don't allow encrypted operations without keys)

Cc: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 48d7b5a8

fs/f2fs/namei.c

+12 −0
Original line number Diff line number Diff line
@@ -663,6 +663,12 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	bool is_old_inline = f2fs_has_inline_dentry(old_dir);

	int err = -ENOENT;



	if ((f2fs_encrypted_inode(old_dir) &&

			!fscrypt_has_encryption_key(old_dir)) ||

			(f2fs_encrypted_inode(new_dir) &&

			!fscrypt_has_encryption_key(new_dir)))

		return -ENOKEY;



	if ((old_dir != new_dir) && f2fs_encrypted_inode(new_dir) &&

			!fscrypt_has_permitted_context(new_dir, old_inode)) {

		err = -EPERM;
@@ -843,6 +849,12 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, 
	int old_nlink = 0, new_nlink = 0;

	int err = -ENOENT;



	if ((f2fs_encrypted_inode(old_dir) &&

			!fscrypt_has_encryption_key(old_dir)) ||

			(f2fs_encrypted_inode(new_dir) &&

			!fscrypt_has_encryption_key(new_dir)))

		return -ENOKEY;



	if ((f2fs_encrypted_inode(old_dir) || f2fs_encrypted_inode(new_dir)) &&

			(old_dir != new_dir) &&

			(!fscrypt_has_permitted_context(new_dir, old_inode) ||