ext4: don't allow encrypted operations without keys

commit 173b8439e1ba362007315868928bf9d26e5cc5a6 upstream.

While we allow deletes without the key, the following should not be
permitted:

# cd /vdc/encrypted-dir-without-key
# ls -l
total 4
-rw-r--r-- 1 root root   0 Dec 27 22:35 6,LKNRJsp209FbXoSvJWzB
-rw-r--r-- 1 root root 286 Dec 27 22:35 uRJ5vJh9gE7vcomYMqTAyD
# mv uRJ5vJh9gE7vcomYMqTAyD  6,LKNRJsp209FbXoSvJWzB

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 423a21c..00b8a5a 100644 (file)
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -3527,6 +3527,12 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,
                        EXT4_I(old_dentry->d_inode)->i_projid)))
                return -EXDEV;
 
+       if ((ext4_encrypted_inode(old_dir) &&
+            !fscrypt_has_encryption_key(old_dir)) ||
+           (ext4_encrypted_inode(new_dir) &&
+            !fscrypt_has_encryption_key(new_dir)))
+               return -ENOKEY;
+
        retval = dquot_initialize(old.dir);
        if (retval)
                return retval;
@@ -3726,6 +3732,12 @@ static int ext4_cross_rename(struct inode *old_dir, struct dentry *old_dentry,
        u8 new_file_type;
        int retval;
 
+       if ((ext4_encrypted_inode(old_dir) &&
+            !fscrypt_has_encryption_key(old_dir)) ||
+           (ext4_encrypted_inode(new_dir) &&
+            !fscrypt_has_encryption_key(new_dir)))
+               return -ENOKEY;
+
        if ((ext4_encrypted_inode(old_dir) ||
             ext4_encrypted_inode(new_dir)) &&
            (old_dir != new_dir) &&