ubifs: Use fscrypt ioctl() helpers

Commit db717d8e26c2 ("fscrypto: move ioctl processing more fully into
common code") moved ioctl() related functions into fscrypt and offers
us now a set of helper functions.

Signed-off-by: Richard Weinberger <richard@nod.at>
Reviewed-by: David Gstir <david@sigma-star.at>

diff --git a/fs/ubifs/ioctl.c b/fs/ubifs/ioctl.c
index 3d10f5525274c98cb91de08c0ccb5733253bba32..78d713644df3c00cf5f3be6ae51b742a47345417 100644 (file)
--- a/fs/ubifs/ioctl.c
+++ b/fs/ubifs/ioctl.c
@@ -184,39 +184,19 @@ long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        case FS_IOC_SET_ENCRYPTION_POLICY: {
 #ifdef CONFIG_UBIFS_FS_ENCRYPTION
                struct ubifs_info *c = inode->i_sb->s_fs_info;
-               struct fscrypt_policy policy;
-
-               if (copy_from_user(&policy,
-                                  (struct fscrypt_policy __user *)arg,
-                                  sizeof(policy)))
-                       return -EFAULT;
 
                err = ubifs_enable_encryption(c);
                if (err)
                        return err;
 
-               err = fscrypt_process_policy(file, &policy);
-
-               return err;
+               return fscrypt_ioctl_set_policy(file, (const void __user *)arg);
 #else
                return -EOPNOTSUPP;
 #endif
        }
        case FS_IOC_GET_ENCRYPTION_POLICY: {
 #ifdef CONFIG_UBIFS_FS_ENCRYPTION
-               struct fscrypt_policy policy;
-
-               if (!ubifs_crypt_is_encrypted(inode))
-                       return -ENOENT;
-
-               err = fscrypt_get_policy(inode, &policy);
-               if (err)
-                       return err;
-
-               if (copy_to_user((void __user *)arg, &policy, sizeof(policy)))
-                       return -EFAULT;
-
-               return 0;
+               return fscrypt_ioctl_get_policy(file, (void __user *)arg);
 #else
                return -EOPNOTSUPP;
 #endif

diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 8d0e4818e3ea317d913df85e15d4a8f9863aa2f8..ca72382ce6cc9e58e955373649bec3b994f9d19f 100644 (file)
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -1806,8 +1806,8 @@ int ubifs_decompress(const struct ubifs_info *c, const void *buf, int len,
 #define fscrypt_pullback_bio_page       fscrypt_notsupp_pullback_bio_page
 #define fscrypt_restore_control_page    fscrypt_notsupp_restore_control_page
 #define fscrypt_zeroout_range           fscrypt_notsupp_zeroout_range
-#define fscrypt_process_policy          fscrypt_notsupp_process_policy
-#define fscrypt_get_policy              fscrypt_notsupp_get_policy
+#define fscrypt_ioctl_set_policy       fscrypt_notsupp_ioctl_set_policy
+#define fscrypt_ioctl_get_policy       fscrypt_notsupp_ioctl_get_policy
 #define fscrypt_has_permitted_context   fscrypt_notsupp_has_permitted_context
 #define fscrypt_inherit_context         fscrypt_notsupp_inherit_context
 #define fscrypt_get_encryption_info     fscrypt_notsupp_get_encryption_info