From: Sweet Tea Dorminy <sweettea-kernel@dorminy.me>
To: "Theodore Y. Ts'o" <tytso@mit.edu>,
Jaegeuk Kim <jaegeuk@kernel.org>,
Eric Biggers <ebiggers@kernel.org>, Chris Mason <clm@fb.com>,
Josef Bacik <josef@toxicpanda.com>,
David Sterba <dsterba@suse.com>,
linux-fscrypt@vger.kernel.org, linux-btrfs@vger.kernel.org,
kernel-team@meta.com
Cc: Omar Sandoval <osandov@osandov.com>,
Sweet Tea Dorminy <sweettea-kernel@dorminy.me>
Subject: [PATCH v4 11/21] btrfs: disable various operations on encrypted inodes
Date: Mon, 24 Oct 2022 19:13:21 -0400 [thread overview]
Message-ID: <cf0d8515689bb928a815806e29c47ef33036d1a0.1666651724.git.sweettea-kernel@dorminy.me> (raw)
In-Reply-To: <cover.1666651724.git.sweettea-kernel@dorminy.me>
From: Omar Sandoval <osandov@osandov.com>
Initially, only normal data extents, using the normal (non-direct) IO
path, will be encrypted. This change forbids various other bits:
- allows reflinking only if both inodes have the same encryption status
- disables compressing encrypted inodes
- disables direct IO on encrypted inodes
- disable inline data on encrypted inodes
Signed-off-by: Omar Sandoval <osandov@osandov.com>
Signed-off-by: Sweet Tea Dorminy <sweettea-kernel@dorminy.me>
---
fs/btrfs/btrfs_inode.h | 3 +++
fs/btrfs/file.c | 4 ++--
fs/btrfs/inode.c | 3 ++-
fs/btrfs/reflink.c | 7 +++++++
4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index 530a0ebfab3f..af23bd1fde36 100644
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -385,6 +385,9 @@ static inline bool btrfs_inode_in_log(struct btrfs_inode *inode, u64 generation)
*/
static inline bool btrfs_inode_can_compress(const struct btrfs_inode *inode)
{
+ if (IS_ENCRYPTED(&inode->vfs_inode))
+ return false;
+
if (inode->flags & BTRFS_INODE_NODATACOW ||
inode->flags & BTRFS_INODE_NODATASUM)
return false;
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index a30ddd2697de..97d098b3c2e6 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1808,7 +1808,7 @@ static ssize_t btrfs_direct_write(struct kiocb *iocb, struct iov_iter *from)
goto relock;
}
- if (check_direct_IO(fs_info, from, pos)) {
+ if (IS_ENCRYPTED(inode) || check_direct_IO(fs_info, from, pos)) {
btrfs_inode_unlock(inode, ilock_flags);
goto buffered;
}
@@ -4045,7 +4045,7 @@ static ssize_t btrfs_direct_read(struct kiocb *iocb, struct iov_iter *to)
ssize_t read = 0;
ssize_t ret;
- if (fsverity_active(inode))
+ if (IS_ENCRYPTED(inode) || fsverity_active(inode))
return 0;
if (check_direct_read(btrfs_sb(inode->i_sb), to, iocb->ki_pos))
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index c41ae611767c..55a8fe278435 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -432,7 +432,8 @@ static noinline int cow_file_range_inline(struct btrfs_inode *inode, u64 size,
* compressed) data fits in a leaf and the configured maximum inline
* size.
*/
- if (size < i_size_read(&inode->vfs_inode) ||
+ if (IS_ENCRYPTED(&inode->vfs_inode) ||
+ size < i_size_read(&inode->vfs_inode) ||
size > fs_info->sectorsize ||
data_len > BTRFS_MAX_INLINE_DATA_SIZE(fs_info) ||
data_len > fs_info->max_inline)
diff --git a/fs/btrfs/reflink.c b/fs/btrfs/reflink.c
index f0243eb33df7..4143ebf22d7f 100644
--- a/fs/btrfs/reflink.c
+++ b/fs/btrfs/reflink.c
@@ -808,6 +808,13 @@ static int btrfs_remap_file_range_prep(struct file *file_in, loff_t pos_in,
ASSERT(inode_in->i_sb == inode_out->i_sb);
}
+ /*
+ * Can only reflink encrypted files if both files are encrypted.
+ */
+ if (!fscrypt_have_same_policy(inode_in, inode_out)) {
+ return -EINVAL;
+ }
+
/* Don't make the dst file partly checksummed */
if ((BTRFS_I(inode_in)->flags & BTRFS_INODE_NODATASUM) !=
(BTRFS_I(inode_out)->flags & BTRFS_INODE_NODATASUM)) {
--
2.35.1
next prev parent reply other threads:[~2022-10-25 0:43 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-24 23:13 [PATCH v4 00/21] btrfs: add fscrypt integration Sweet Tea Dorminy
2022-10-24 23:13 ` [PATCH v4 01/21] fscrypt: expose fscrypt_nokey_name Sweet Tea Dorminy
2022-10-24 23:13 ` [PATCH v4 02/21] fscrypt: add fscrypt_have_same_policy() to check inode compatibility Sweet Tea Dorminy
2022-10-27 18:57 ` Omar Sandoval
2022-10-24 23:13 ` [PATCH v4 03/21] fscrypt: allow fscrypt_generate_iv() to distinguish filenames Sweet Tea Dorminy
2022-10-24 23:13 ` [PATCH v4 04/21] fscrypt: add extent-based encryption Sweet Tea Dorminy
2022-10-24 23:13 ` [PATCH v4 05/21] fscrypt: direct key policies for " Sweet Tea Dorminy
2022-10-24 23:13 ` [PATCH v4 06/21] fscrypt: document btrfs' fscrypt quirks Sweet Tea Dorminy
2022-10-24 23:13 ` [PATCH v4 07/21] btrfs: use struct qstr instead of name and namelen Sweet Tea Dorminy
2022-10-24 23:13 ` [PATCH v4 08/21] btrfs: setup qstrings from dentrys using fscrypt helper Sweet Tea Dorminy
2022-10-25 13:14 ` Filipe Manana
2022-10-31 15:42 ` David Sterba
2022-10-24 23:13 ` [PATCH v4 09/21] btrfs: use struct fscrypt_str instead of struct qstr Sweet Tea Dorminy
2022-10-24 23:13 ` [PATCH v4 10/21] btrfs: store directory encryption state Sweet Tea Dorminy
2022-10-24 23:13 ` Sweet Tea Dorminy [this message]
2022-10-24 23:13 ` [PATCH v4 12/21] btrfs: start using fscrypt hooks Sweet Tea Dorminy
2022-10-24 23:13 ` [PATCH v4 13/21] btrfs: add fscrypt_context items Sweet Tea Dorminy
2022-10-24 23:13 ` [PATCH v4 14/21] btrfs: translate btrfs encryption flags and encrypted inode flag Sweet Tea Dorminy
2022-10-24 23:13 ` [PATCH v4 15/21] btrfs: store a fscrypt extent context per normal file extent Sweet Tea Dorminy
2022-10-24 23:13 ` [PATCH v4 16/21] btrfs: encrypt normal file extent data if appropriate Sweet Tea Dorminy
2022-10-24 23:13 ` [PATCH v4 17/21] btrfs: Add new FEATURE_INCOMPAT_ENCRYPT feature flag Sweet Tea Dorminy
2022-10-24 23:13 ` [PATCH v4 18/21] btrfs: implement fscrypt ioctls Sweet Tea Dorminy
2022-10-24 23:13 ` [PATCH v4 19/21] btrfs: permit searching for nokey names for removal Sweet Tea Dorminy
2022-10-24 23:13 ` [PATCH v4 20/21] btrfs: use correct name hash for nokey names Sweet Tea Dorminy
2022-10-24 23:13 ` [PATCH v4 21/21] btrfs: encrypt verity items Sweet Tea Dorminy
2022-10-25 12:35 ` [PATCH v4 00/21] btrfs: add fscrypt integration David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cf0d8515689bb928a815806e29c47ef33036d1a0.1666651724.git.sweettea-kernel@dorminy.me \
--to=sweettea-kernel@dorminy.me \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=ebiggers@kernel.org \
--cc=jaegeuk@kernel.org \
--cc=josef@toxicpanda.com \
--cc=kernel-team@meta.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fscrypt@vger.kernel.org \
--cc=osandov@osandov.com \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).