Commit 173b8439 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: don't allow encrypted operations without keys 



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: default avatarTheodore Ts'o <tytso@mit.edu>
parent 5bbdcbbb

fs/ext4/namei.c

+12 −0
Original line number Diff line number Diff line
@@ -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;
@@ -3727,6 +3733,12 @@ static int ext4_cross_rename(struct inode *old_dir, struct dentry *old_dentry, 
	int retval;

	struct timespec ctime;



	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) &&

CRA Git | Maintained and supported by SUSTech CRA and CCSE