diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2015-05-31 19:35:09 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2015-05-31 19:35:09 +0200 |
| commit | c2faccaff6a16d331df832135ede6d4774c2d2a0 (patch) | |
| tree | a0bc74e2916923f7552a12b3187a6acef5a3138d /fs | |
| parent | ext4 crypto: encrypt tmpfile located in encryption protected directory (diff) | |
| download | linux-c2faccaff6a16d331df832135ede6d4774c2d2a0.tar.xz linux-c2faccaff6a16d331df832135ede6d4774c2d2a0.zip | |
ext4 crypto: enforce crypto policy restrictions on cross-renames
Thanks to Chao Yu <chao2.yu@samsung.com> for pointing out the need for
this check.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/namei.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 1e7d65d7e6d7..401b099e3af3 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -3647,6 +3647,15 @@ 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) || + ext4_encrypted_inode(new_dir)) && + (old_dir != new_dir) && + (!ext4_is_child_context_consistent_with_parent(new_dir, + old.inode) || + !ext4_is_child_context_consistent_with_parent(old_dir, + new.inode))) + return -EPERM; + dquot_initialize(old.dir); dquot_initialize(new.dir); |