When a file is moved or linked into another directory
its current crypto policy has to be compatible with the
target policy.

Signed-off-by: Richard Weinberger <rich...@nod.at>
---
 fs/ubifs/dir.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index e80de3852c3e..a77edc5ca5c9 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -544,6 +544,10 @@ static int ubifs_link(struct dentry *old_dentry, struct 
inode *dir,
        ubifs_assert(inode_is_locked(dir));
        ubifs_assert(inode_is_locked(inode));
 
+       if (ubifs_crypt_is_encrypted(dir) &&
+           !fscrypt_has_permitted_context(dir, inode))
+               return -EPERM;
+
        err = dbg_check_synced_i_size(c, inode);
        if (err)
                return err;
@@ -1027,6 +1031,11 @@ static int ubifs_rename(struct inode *old_dir, struct 
dentry *old_dentry,
        if (unlink)
                ubifs_assert(inode_is_locked(new_inode));
 
+       if (old_dir != new_dir) {
+               if (ubifs_crypt_is_encrypted(new_dir) &&
+                   !fscrypt_has_permitted_context(new_dir, old_inode))
+                       return -EPERM;
+       }
 
        if (unlink && is_dir) {
                err = ubifs_check_dir_empty(new_inode);
-- 
2.7.3

Reply via email to