diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2016-12-28 00:22:52 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-01-08 00:58:23 -0500 |
| commit | 173b8439e1ba362007315868928bf9d26e5cc5a6 (patch) | |
| tree | 68b5b61d03d14e79a6e93059c15015cd26e09750 /fs/ext4/namei.c | |
| parent | 5bbdcbbb396196f1c94110ad7a041e90de95c4c2 (diff) | |
| download | linux-173b8439e1ba362007315868928bf9d26e5cc5a6.tar.gz linux-173b8439e1ba362007315868928bf9d26e5cc5a6.tar.bz2 linux-173b8439e1ba362007315868928bf9d26e5cc5a6.zip | |
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: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/namei.c')
| -rw-r--r-- | fs/ext4/namei.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 80b8afa4a8f9..bb880c326191 100644 --- 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; @@ -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) && |