1 files changed, 91 insertions, 6 deletions

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 13c49af7a06a..1e3fd5c9a72b 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -945,9 +945,6 @@ static struct inode *ext4_alloc_inode(struct super_block *sb)
         ei->i_datasync_tid = 0;
         atomic_set(&ei->i_unwritten, 0);
         INIT_WORK(&ei->i_rsv_conversion_work, ext4_end_io_rsv_work);
-#ifdef CONFIG_EXT4_FS_ENCRYPTION
-        ei->i_crypt_info = NULL;
-#endif
         return &ei->vfs_inode;
 }
 
@@ -1026,8 +1023,7 @@ void ext4_clear_inode(struct inode *inode)
                 EXT4_I(inode)->jinode = NULL;
         }
 #ifdef CONFIG_EXT4_FS_ENCRYPTION
-        if (EXT4_I(inode)->i_crypt_info)
-                ext4_free_encryption_info(inode, EXT4_I(inode)->i_crypt_info);
+        fscrypt_put_encryption_info(inode, NULL);
 #endif
 }
 
@@ -1094,6 +1090,90 @@ static int bdev_try_to_free_page(struct super_block *sb, struct page *page,
         return try_to_free_buffers(page);
 }
 
+#ifdef CONFIG_EXT4_FS_ENCRYPTION
+static int ext4_get_context(struct inode *inode, void *ctx, size_t len)
+{
+        return ext4_xattr_get(inode, EXT4_XATTR_INDEX_ENCRYPTION,
+                                 EXT4_XATTR_NAME_ENCRYPTION_CONTEXT, ctx, len);
+}
+
+static int ext4_key_prefix(struct inode *inode, u8 **key)
+{
+        *key = EXT4_SB(inode->i_sb)->key_prefix;
+        return EXT4_SB(inode->i_sb)->key_prefix_size;
+}
+
+static int ext4_prepare_context(struct inode *inode)
+{
+        return ext4_convert_inline_data(inode);
+}
+
+static int ext4_set_context(struct inode *inode, const void *ctx, size_t len,
+                                                        void *fs_data)
+{
+        handle_t *handle;
+        int res, res2;
+
+        /* fs_data is null when internally used. */
+        if (fs_data) {
+                res  = ext4_xattr_set(inode, EXT4_XATTR_INDEX_ENCRYPTION,
+                                EXT4_XATTR_NAME_ENCRYPTION_CONTEXT, ctx,
+                                len, 0);
+                if (!res) {
+                        ext4_set_inode_flag(inode, EXT4_INODE_ENCRYPT);
+                        ext4_clear_inode_state(inode,
+                                        EXT4_STATE_MAY_INLINE_DATA);
+                }
+                return res;
+        }
+
+        handle = ext4_journal_start(inode, EXT4_HT_MISC,
+                        ext4_jbd2_credits_xattr(inode));
+        if (IS_ERR(handle))
+                return PTR_ERR(handle);
+
+        res = ext4_xattr_set(inode, EXT4_XATTR_INDEX_ENCRYPTION,
+                        EXT4_XATTR_NAME_ENCRYPTION_CONTEXT, ctx,
+                        len, 0);
+        if (!res) {
+                ext4_set_inode_flag(inode, EXT4_INODE_ENCRYPT);
+                res = ext4_mark_inode_dirty(handle, inode);
+                if (res)
+                        EXT4_ERROR_INODE(inode, "Failed to mark inode dirty");
+        }
+        res2 = ext4_journal_stop(handle);
+        if (!res)
+                res = res2;
+        return res;
+}
+
+static int ext4_dummy_context(struct inode *inode)
+{
+        return DUMMY_ENCRYPTION_ENABLED(EXT4_SB(inode->i_sb));
+}
+
+static unsigned ext4_max_namelen(struct inode *inode)
+{
+        return S_ISLNK(inode->i_mode) ? inode->i_sb->s_blocksize :
+                EXT4_NAME_LEN;
+}
+
+static struct fscrypt_operations ext4_cryptops = {
+        .get_context            = ext4_get_context,
+        .key_prefix             = ext4_key_prefix,
+        .prepare_context        = ext4_prepare_context,
+        .set_context            = ext4_set_context,
+        .dummy_context          = ext4_dummy_context,
+        .is_encrypted           = ext4_encrypted_inode,
+        .empty_dir              = ext4_empty_dir,
+        .max_namelen            = ext4_max_namelen,
+};
+#else
+static struct fscrypt_operations ext4_cryptops = {
+        .is_encrypted           = ext4_encrypted_inode,
+};
+#endif
+
 #ifdef CONFIG_QUOTA
 static char *quotatypes[] = INITQFNAMES;
 #define QTYPE2NAME(t) (quotatypes[t])
@@ -3693,6 +3773,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
         sb->s_op = &ext4_sops;
         sb->s_export_op = &ext4_export_ops;
         sb->s_xattr = ext4_xattr_handlers;
+        sb->s_cop = &ext4_cryptops;
 #ifdef CONFIG_QUOTA
         sb->dq_op = &ext4_quota_operations;
         if (ext4_has_feature_quota(sb))
@@ -4003,6 +4084,11 @@ no_journal:
         ratelimit_state_init(&sbi->s_msg_ratelimit_state, 5 * HZ, 10);
 
         kfree(orig_data);
+#ifdef CONFIG_EXT4_FS_ENCRYPTION
+        memcpy(sbi->key_prefix, EXT4_KEY_DESC_PREFIX,
+                                EXT4_KEY_DESC_PREFIX_SIZE);
+        sbi->key_prefix_size = EXT4_KEY_DESC_PREFIX_SIZE;
+#endif
         return 0;
 
 cantfind_ext4:
@@ -5431,7 +5517,6 @@ out5:
 
 static void __exit ext4_exit_fs(void)
 {
-        ext4_exit_crypto();
         ext4_destroy_lazyinit_thread();
         unregister_as_ext2();
         unregister_as_ext3();