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: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index 489fa0d..08d7dc9 100644 (file)
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -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) ||