On Mon, 2020-09-07 at 21:29 -0700, Eric Biggers wrote:
> On Fri, Sep 04, 2020 at 12:05:28PM -0400, Jeff Layton wrote:
> > Store the fscrypt context for an inode as an encryption.ctx xattr.
> >
> > Also add support for "dummy" encryption (useful for testing with
> > automated test harnesses like xfstests).
>
> Can you put the test_dummy_encryption support in a separate patch?
>
> > +static int ceph_crypt_get_context(struct inode *inode, void *ctx, size_t len)
> > +{
> > + int ret = __ceph_getxattr(inode, CEPH_XATTR_NAME_ENCRYPTION_CONTEXT, ctx, len);
> > +
> > + if (ret > 0)
> > + inode_set_flags(inode, S_ENCRYPTED, S_ENCRYPTED);
> > + return ret;
> > +}
> > +
> > +static int ceph_crypt_set_context(struct inode *inode, const void *ctx, size_t len, void *fs_data)
> > +{
> > + int ret;
> > +
> > + WARN_ON_ONCE(fs_data);
> > + ret = __ceph_setxattr(inode, CEPH_XATTR_NAME_ENCRYPTION_CONTEXT, ctx, len, XATTR_CREATE);
> > + if (ret == 0)
> > + inode_set_flags(inode, S_ENCRYPTED, S_ENCRYPTED);
> > + return ret;
> > +}
>
> get_context() shouldn't be setting the S_ENCRYPTED inode flag.
> Only set_context() should be doing that.
>
> > +
> > +static bool ceph_crypt_empty_dir(struct inode *inode)
> > +{
> > + struct ceph_inode_info *ci = ceph_inode(inode);
> > +
> > + return ci->i_rsubdirs + ci->i_rfiles == 1;
> > +}
> > +
> > +static const union fscrypt_context *
> > +ceph_get_dummy_context(struct super_block *sb)
> > +{
> > + return ceph_sb_to_client(sb)->dummy_enc_ctx.ctx;
> > +}
> > +
> > +static struct fscrypt_operations ceph_fscrypt_ops = {
> > + .key_prefix = "ceph:",
>
> IMO you shouldn't set .key_prefix here, since it's deprecated.
> Just leave it unset so that ceph will only support the generic prefix "fscrypt:"
> as well as FS_IOC_ADD_ENCRYPTION_KEY.
>
> > enum ceph_recover_session_mode {
> > @@ -197,6 +200,8 @@ static const struct fs_parameter_spec ceph_mount_parameters[] = {
> > fsparam_u32 ("rsize", Opt_rsize),
> > fsparam_string ("snapdirname", Opt_snapdirname),
> > fsparam_string ("source", Opt_source),
> > + fsparam_flag_no ("test_dummy_encryption", Opt_test_dummy_encryption),
> > + fsparam_string ("test_dummy_encryption", Opt_test_dummy_encryption),
>
> I think you should use fsparam_flag instead of fsparam_flag_no, since otherwise
> "notest_dummy_encryption" will be recognized. There's not a problem with it
> per se, but none of the other filesystems that support "test_dummy_encryption"
> allow "notest_dummy_encryption". It's nice to keep things consistent.
>
> I.e. if "notest_dummy_encryption" is really something that would be useful
> (presumably only for remount, since it's a test-only option that will never be
> on by default), then we should add it to ext4, f2fs, and ceph -- not just ceph.
>
> > + /* Don't allow test_dummy_encryption to change on remount */
> > + if (fsopt->flags & CEPH_MOUNT_OPT_TEST_DUMMY_ENC) {
> > + if (!ceph_test_mount_opt(fsc, TEST_DUMMY_ENC))
> > + return -EEXIST;
> > + } else {
> > + if (ceph_test_mount_opt(fsc, TEST_DUMMY_ENC))
> > + return -EEXIST;
> > + }
> > +
>
> Can you check what ext4 and f2fs do for this? test_dummy_encryption isn't just
> a boolean flag anymore, so this logic isn't sufficient to prevent it from
> changing during remount. For example someone could mount with
> test_dummy_encryption=v1, then try to remount with test_dummy_encryption=v2.
> On ext4 and f2fs, that intentionally fails.
Ok, I'll see what I can do. Note that those fs' all use the old mount
API (so far) and ceph has been converted to the new one. We may need to
rework a bit of the fscrypt infrastructure to handle the new mount API.
--
Jeff Layton <jlayton@xxxxxxxxxx>
