From: Eric Biggers <ebiggers@kernel.org>
To: Jeff Layton <jlayton@kernel.org>
Cc: ceph-devel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-fscrypt@vger.kernel.org
Subject: Re: [RFC PATCH v2 11/18] ceph: add routine to create context prior to RPC
Date: Mon, 7 Sep 2020 21:43:56 -0700 [thread overview]
Message-ID: <20200908044356.GJ68127@sol.localdomain> (raw)
In-Reply-To: <20200904160537.76663-12-jlayton@kernel.org>
On Fri, Sep 04, 2020 at 12:05:30PM -0400, Jeff Layton wrote:
> After pre-creating a new inode, do an fscrypt prepare on it, fetch a
> new encryption context and then marshal that into the security context
> to be sent along with the RPC.
>
> Signed-off-by: Jeff Layton <jlayton@kernel.org>
> ---
> fs/ceph/crypto.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++
> fs/ceph/crypto.h | 8 ++++++
> fs/ceph/inode.c | 10 ++++++--
> fs/ceph/super.h | 3 +++
> 4 files changed, 82 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ceph/crypto.c b/fs/ceph/crypto.c
> index 22a09d422b72..f4849f8b32df 100644
> --- a/fs/ceph/crypto.c
> +++ b/fs/ceph/crypto.c
> @@ -67,3 +67,66 @@ int ceph_fscrypt_set_ops(struct super_block *sb)
> }
> return 0;
> }
> +
> +int ceph_fscrypt_prepare_context(struct inode *dir, struct inode *inode,
> + struct ceph_acl_sec_ctx *as)
> +{
> + int ret, ctxsize;
> + size_t name_len;
> + char *name;
> + struct ceph_pagelist *pagelist = as->pagelist;
> + bool encrypted = false;
> +
> + ret = fscrypt_prepare_new_inode(dir, inode, &encrypted);
> + if (ret)
> + return ret;
> + if (!encrypted)
> + return 0;
> +
> + inode_set_flags(inode, S_ENCRYPTED, S_ENCRYPTED);
This is a new inode, so 'inode->i_flags |= S_ENCRYPTED' would be sufficient.
> +
> + /* No need to set context for dummy encryption */
> + if (fscrypt_get_dummy_context(inode->i_sb))
> + return 0;
This isn't correct. When test_dummy_encryption causes a new inode to be
automatically encrypted, the inode's encryption context is still supposed to be
saved to disk.
Also, when the filesystem is mounted with test_dummy_encryption, there may
already be existing encrypted directories that were created via the regular path
(not via test_dummy_encryption). Those should keep working as expected. That
likewise requires saving new encryption contexts to disk.
- Eric
next prev parent reply other threads:[~2020-09-08 4:44 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-04 16:05 [RFC PATCH v2 00/18] ceph+fscrypt: context, filename and symlink support Jeff Layton
2020-09-04 16:05 ` [RFC PATCH v2 01/18] vfs: export new_inode_pseudo Jeff Layton
2020-09-08 3:38 ` Eric Biggers
2020-09-08 11:27 ` Jeff Layton
2020-09-08 22:31 ` Eric Biggers
2020-09-09 10:47 ` Jeff Layton
2020-09-09 16:12 ` Eric Biggers
2020-09-09 16:51 ` Jeff Layton
2020-09-09 18:49 ` Eric Biggers
2020-09-09 19:24 ` Jeff Layton
2020-09-04 16:05 ` [RFC PATCH v2 02/18] fscrypt: drop unused inode argument from fscrypt_fname_alloc_buffer Jeff Layton
2020-09-04 16:05 ` [RFC PATCH v2 03/18] fscrypt: export fscrypt_d_revalidate Jeff Layton
2020-09-04 16:05 ` [RFC PATCH v2 04/18] fscrypt: add fscrypt_new_context_from_inode Jeff Layton
2020-09-08 3:48 ` Eric Biggers
2020-09-08 11:29 ` Jeff Layton
2020-09-08 12:29 ` Jeff Layton
2020-09-08 22:34 ` Eric Biggers
2020-09-04 16:05 ` [RFC PATCH v2 05/18] fscrypt: don't balk when inode is already marked encrypted Jeff Layton
2020-09-08 3:52 ` Eric Biggers
2020-09-08 12:54 ` Jeff Layton
2020-09-08 23:08 ` Eric Biggers
2020-09-04 16:05 ` [RFC PATCH v2 06/18] fscrypt: move nokey_name conversion to separate function and export it Jeff Layton
2020-09-08 3:55 ` Eric Biggers
2020-09-08 12:50 ` Jeff Layton
2020-09-08 22:53 ` Eric Biggers
2020-09-09 16:02 ` Jeff Layton
2020-09-04 16:05 ` [RFC PATCH v2 07/18] lib: lift fscrypt base64 conversion into lib/ Jeff Layton
2020-09-08 3:59 ` Eric Biggers
2020-09-08 12:51 ` Jeff Layton
2020-09-04 16:05 ` [RFC PATCH v2 08/18] ceph: add fscrypt ioctls Jeff Layton
2020-09-04 16:05 ` [RFC PATCH v2 09/18] ceph: crypto context handling for ceph Jeff Layton
2020-09-08 4:29 ` Eric Biggers
2020-09-08 16:14 ` Jeff Layton
2020-09-04 16:05 ` [RFC PATCH v2 10/18] ceph: preallocate inode for ops that may create one Jeff Layton
2020-09-04 16:05 ` [RFC PATCH v2 11/18] ceph: add routine to create context prior to RPC Jeff Layton
2020-09-08 4:43 ` Eric Biggers [this message]
2020-09-04 16:05 ` [RFC PATCH v2 12/18] ceph: set S_ENCRYPTED bit if new inode has encryption.ctx xattr Jeff Layton
2020-09-08 4:57 ` Eric Biggers
2020-09-09 12:20 ` Jeff Layton
2020-09-09 15:53 ` Jeff Layton
2020-09-09 16:33 ` Eric Biggers
2020-09-09 17:19 ` Jeff Layton
2020-09-04 16:05 ` [RFC PATCH v2 13/18] ceph: make ceph_msdc_build_path use ref-walk Jeff Layton
2020-09-04 16:05 ` [RFC PATCH v2 14/18] ceph: add encrypted fname handling to ceph_mdsc_build_path Jeff Layton
2020-09-08 5:06 ` Eric Biggers
2020-09-09 12:24 ` Jeff Layton
2020-09-04 16:05 ` [RFC PATCH v2 15/18] ceph: make d_revalidate call fscrypt revalidator for encrypted dentries Jeff Layton
2020-09-08 5:12 ` Eric Biggers
2020-09-09 12:26 ` Jeff Layton
2020-09-09 16:18 ` Eric Biggers
2020-09-04 16:05 ` [RFC PATCH v2 16/18] ceph: add support to readdir for encrypted filenames Jeff Layton
2020-09-08 5:34 ` Eric Biggers
2020-09-09 13:02 ` Jeff Layton
2020-09-04 16:05 ` [RFC PATCH v2 17/18] ceph: add fscrypt support to ceph_fill_trace Jeff Layton
2020-09-04 16:05 ` [RFC PATCH v2 18/18] ceph: create symlinks with encrypted and base64-encoded targets Jeff Layton
2020-09-04 16:11 ` Jeff Layton
2020-09-08 5:43 ` Eric Biggers
2020-09-08 5:54 ` [RFC PATCH v2 00/18] ceph+fscrypt: context, filename and symlink support Eric Biggers
2020-09-08 12:09 ` Jeff Layton
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=20200908044356.GJ68127@sol.localdomain \
--to=ebiggers@kernel.org \
--cc=ceph-devel@vger.kernel.org \
--cc=jlayton@kernel.org \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
/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).