ubifs: switch to fscrypt_prepare_rename()

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Richard Weinberger <richard@nod.at>

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 09e6c56b11bcef19bd66f14402c4db9a74342c9e..7bf847d79b4a3457510c26dfdfd16d380b61c715 100644 (file)
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -1353,12 +1353,6 @@ static int do_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);
                if (err)
@@ -1573,13 +1567,6 @@ static int ubifs_xrename(struct inode *old_dir, struct dentry *old_dentry,
 
        ubifs_assert(fst_inode && snd_inode);
 
-       if ((ubifs_crypt_is_encrypted(old_dir) ||
-           ubifs_crypt_is_encrypted(new_dir)) &&
-           (old_dir != new_dir) &&
-           (!fscrypt_has_permitted_context(new_dir, fst_inode) ||
-            !fscrypt_has_permitted_context(old_dir, snd_inode)))
-               return -EPERM;
-
        err = fscrypt_setup_filename(old_dir, &old_dentry->d_name, 0, &fst_nm);
        if (err)
                return err;
@@ -1624,12 +1611,19 @@ static int ubifs_rename(struct inode *old_dir, struct dentry *old_dentry,
                        struct inode *new_dir, struct dentry *new_dentry,
                        unsigned int flags)
 {
+       int err;
+
        if (flags & ~(RENAME_NOREPLACE | RENAME_WHITEOUT | RENAME_EXCHANGE))
                return -EINVAL;
 
        ubifs_assert(inode_is_locked(old_dir));
        ubifs_assert(inode_is_locked(new_dir));
 
+       err = fscrypt_prepare_rename(old_dir, old_dentry, new_dir, new_dentry,
+                                    flags);
+       if (err)
+               return err;
+
        if (flags & RENAME_EXCHANGE)
                return ubifs_xrename(old_dir, old_dentry, new_dir, new_dentry);