From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 31 May 2015 17:35:09 +0000 (-0400)
Subject: ext4 crypto: enforce crypto policy restrictions on cross-renames
X-Git-Tag: firefly_0821_release~176^2~1456^2~44
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c2faccaff6a16d331df832135ede6d4774c2d2a0;p=firefly-linux-kernel-4.4.55.git

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

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