@@ -5392,6 +5392,38 @@ static int put_file_data(struct send_ctx *sctx, u64 offset, u32 len)
return ret;
}
+static int load_fscrypt_context(struct send_ctx *sctx)
+{
+ struct btrfs_root *root = sctx->send_root;
+ struct name_cache_entry *nce;
+ struct inode *dir;
+ int ret;
+
+ if (!btrfs_fs_incompat(root->fs_info, ENCRYPT))
+ return 0;
+
+ /*
+ * If we're encrypted we need to load the parent inode in order to make
+ * sure the encryption context is loaded. We have to do this even if
+ * we're not encrypted, as we need to make sure that we don't violate
+ * the rule about encrypted children with non-encrypted parents, which
+ * is enforced by __fscrypt_file_open.
+ */
+ nce = name_cache_search(sctx, sctx->cur_ino, sctx->cur_inode_gen);
+ if (!nce) {
+ ASSERT(nce);
+ return -EINVAL;
+ }
+
+ dir = btrfs_iget(root->fs_info->sb, nce->parent_ino, root);
+ if (IS_ERR(dir))
+ return PTR_ERR(dir);
+
+ ret = __fscrypt_file_open(dir, sctx->cur_inode);
+ iput(dir);
+ return ret;
+}
+
/*
* Read some bytes from the current inode/file and send a write command to
* user space.
@@ -5415,7 +5447,9 @@ static int send_write(struct send_ctx *sctx, u64 offset, u32 len)
ret = get_cur_path(sctx, sctx->cur_ino, sctx->cur_inode_gen, p);
if (ret < 0)
goto out;
-
+ ret = load_fscrypt_context(sctx);
+ if (ret < 0)
+ goto out;
TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, p);
TLV_PUT_U64(sctx, BTRFS_SEND_A_FILE_OFFSET, offset);
ret = put_file_data(sctx, offset, len);
For send we will read the pages and copy them into our buffer. Use the fscrypt_inode_open helper to make sure the key is loaded properly before trying to read from the inode so the contents are properly decrypted. Signed-off-by: Josef Bacik <josef@toxicpanda.com> --- fs/btrfs/send.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-)