ubifs: wire up new fscrypt ioctls

Wire up the new ioctls for adding and removing fscrypt keys to/from the
filesystem, and the new ioctl for retrieving v2 encryption policies.

The key removal ioctls also required making UBIFS use
fscrypt_drop_inode().

For more details see Documentation/filesystems/fscrypt.rst and the
fscrypt patches that added the implementation of these ioctls.

Reviewed-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Eric Biggers <ebiggers@google.com>

diff --git a/fs/ubifs/ioctl.c b/fs/ubifs/ioctl.c
index 034ad14710d14a395ab818389be4cbe5177cec9e..5dc5abca11c7046eac9c10b908e723a33ae74b0c 100644 (file)
--- a/fs/ubifs/ioctl.c
+++ b/fs/ubifs/ioctl.c
@@ -185,6 +185,21 @@ long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        case FS_IOC_GET_ENCRYPTION_POLICY:
                return fscrypt_ioctl_get_policy(file, (void __user *)arg);
 
+       case FS_IOC_GET_ENCRYPTION_POLICY_EX:
+               return fscrypt_ioctl_get_policy_ex(file, (void __user *)arg);
+
+       case FS_IOC_ADD_ENCRYPTION_KEY:
+               return fscrypt_ioctl_add_key(file, (void __user *)arg);
+
+       case FS_IOC_REMOVE_ENCRYPTION_KEY:
+               return fscrypt_ioctl_remove_key(file, (void __user *)arg);
+
+       case FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS:
+               return fscrypt_ioctl_remove_key_all_users(file,
+                                                         (void __user *)arg);
+       case FS_IOC_GET_ENCRYPTION_KEY_STATUS:
+               return fscrypt_ioctl_get_key_status(file, (void __user *)arg);
+
        default:
                return -ENOTTY;
        }
@@ -202,6 +217,11 @@ long ubifs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                break;
        case FS_IOC_SET_ENCRYPTION_POLICY:
        case FS_IOC_GET_ENCRYPTION_POLICY:
+       case FS_IOC_GET_ENCRYPTION_POLICY_EX:
+       case FS_IOC_ADD_ENCRYPTION_KEY:
+       case FS_IOC_REMOVE_ENCRYPTION_KEY:
+       case FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS:
+       case FS_IOC_GET_ENCRYPTION_KEY_STATUS:
                break;
        default:
                return -ENOIOCTLCMD;

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 2c0803b0ac3aa21190ca84ca65f59f2e5de1069b..3ad6620f14fb81711edf1242060a644787ec29ea 100644 (file)
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -318,6 +318,16 @@ static int ubifs_write_inode(struct inode *inode, struct writeback_control *wbc)
        return err;
 }
 
+static int ubifs_drop_inode(struct inode *inode)
+{
+       int drop = generic_drop_inode(inode);
+
+       if (!drop)
+               drop = fscrypt_drop_inode(inode);
+
+       return drop;
+}
+
 static void ubifs_evict_inode(struct inode *inode)
 {
        int err;
@@ -1990,6 +2000,7 @@ const struct super_operations ubifs_super_operations = {
        .free_inode    = ubifs_free_inode,
        .put_super     = ubifs_put_super,
        .write_inode   = ubifs_write_inode,
+       .drop_inode    = ubifs_drop_inode,
        .evict_inode   = ubifs_evict_inode,
        .statfs        = ubifs_statfs,
        .dirty_inode   = ubifs_dirty_inode,