From: Jeff Layton <jlayton@kernel.org>
To: Luis Henriques <lhenriques@suse.de>
Cc: ceph-devel@vger.kernel.org, linux-fscrypt@vger.kernel.org,
linux-fsdevel@vger.kernel.org
Subject: Re: [RFC PATCH v4 08/17] ceph: add routine to create fscrypt context prior to RPC
Date: Fri, 22 Jan 2021 12:32:56 -0500 [thread overview]
Message-ID: <d4f84211f017280cd1dd98bcdee99d11621c5d7f.camel@kernel.org> (raw)
In-Reply-To: <87tur8532c.fsf@suse.de>
On Fri, 2021-01-22 at 16:50 +0000, Luis Henriques wrote:
> Jeff Layton <jlayton@kernel.org> writes:
>
> > 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 | 61 ++++++++++++++++++++++++++++++++++++++++++++++++
> > fs/ceph/crypto.h | 12 ++++++++++
> > fs/ceph/inode.c | 9 +++++--
> > fs/ceph/super.h | 3 +++
> > 4 files changed, 83 insertions(+), 2 deletions(-)
> >
> > diff --git a/fs/ceph/crypto.c b/fs/ceph/crypto.c
> > index 879d9a0d3751..f037a4939026 100644
> > --- a/fs/ceph/crypto.c
> > +++ b/fs/ceph/crypto.c
> > @@ -46,3 +46,64 @@ void ceph_fscrypt_set_ops(struct super_block *sb)
> > {
> > fscrypt_set_ops(sb, &ceph_fscrypt_ops);
> > }
> > +
> > +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->i_flags |= S_ENCRYPTED;
> > +
> > + ctxsize = fscrypt_context_for_new_inode(&as->fscrypt, inode);
> > + if (ctxsize < 0)
> > + return ctxsize;
> > +
> > + /* marshal it in page array */
> > + if (!pagelist) {
> > + pagelist = ceph_pagelist_alloc(GFP_KERNEL);
> > + if (!pagelist)
> > + return -ENOMEM;
> > + ret = ceph_pagelist_reserve(pagelist, PAGE_SIZE);
> > + if (ret)
> > + goto out;
> > + ceph_pagelist_encode_32(pagelist, 1);
> > + }
> > +
> > + name = CEPH_XATTR_NAME_ENCRYPTION_CONTEXT;
> > + name_len = strlen(name);
> > + ret = ceph_pagelist_reserve(pagelist, 4 * 2 + name_len + ctxsize);
> > + if (ret)
> > + goto out;
> > +
> > + if (as->pagelist) {
> > + BUG_ON(pagelist->length <= sizeof(__le32));
> > + if (list_is_singular(&pagelist->head)) {
> > + le32_add_cpu((__le32*)pagelist->mapped_tail, 1);
> > + } else {
> > + struct page *page = list_first_entry(&pagelist->head,
> > + struct page, lru);
> > + void *addr = kmap_atomic(page);
> > + le32_add_cpu((__le32*)addr, 1);
> > + kunmap_atomic(addr);
> > + }
> > + }
> > +
>
> I've been staring at this function for a bit. And at this point I would
> expect something like this:
>
> } else
> as->pagelist = pagelist;
>
> as I'm not seeing pagelist being used anywhere if it's allocated in this
> function.
>
It gets used near the end, in the ceph_pagelist_append calls. Once we've
appended the xattr, we don't need the pagelist anymore and can free it.
That said, the whole way the ceph_pagelist stuff is managed is weird.
I'm not clear why it was done that way, and maybe we ought to rework
this, SELinux and ACL handling to not use them.
I think that's a cleanup for another day.
--
Jeff Layton <jlayton@kernel.org>
next prev parent reply other threads:[~2021-01-22 17:50 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-20 18:28 [RFC PATCH v4 00/17] ceph+fscrypt: context, filename and symlink support Jeff Layton
2021-01-20 18:28 ` [RFC PATCH v4 01/17] vfs: export new_inode_pseudo Jeff Layton
2021-01-20 18:28 ` [RFC PATCH v4 02/17] fscrypt: export fscrypt_base64_encode and fscrypt_base64_decode Jeff Layton
2021-01-20 18:28 ` [RFC PATCH v4 03/17] fscrypt: export fscrypt_fname_encrypt and fscrypt_fname_encrypted_size Jeff Layton
2021-01-20 18:28 ` [RFC PATCH v4 04/17] fscrypt: add fscrypt_context_for_new_inode Jeff Layton
2021-01-20 18:28 ` [RFC PATCH v4 05/17] ceph: crypto context handling for ceph Jeff Layton
2021-01-22 16:41 ` Luis Henriques
2021-01-22 17:26 ` Jeff Layton
2021-01-25 10:14 ` Luis Henriques
2021-01-20 18:28 ` [RFC PATCH v4 06/17] ceph: implement -o test_dummy_encryption mount option Jeff Layton
2021-01-20 18:28 ` [RFC PATCH v4 07/17] ceph: preallocate inode for ops that may create one Jeff Layton
2021-01-20 18:28 ` [RFC PATCH v4 08/17] ceph: add routine to create fscrypt context prior to RPC Jeff Layton
2021-01-22 16:50 ` Luis Henriques
2021-01-22 17:32 ` Jeff Layton [this message]
2021-01-25 10:14 ` Luis Henriques
2021-01-20 18:28 ` [RFC PATCH v4 09/17] ceph: make ceph_msdc_build_path use ref-walk Jeff Layton
2021-01-20 18:28 ` [RFC PATCH v4 10/17] ceph: add encrypted fname handling to ceph_mdsc_build_path Jeff Layton
2021-01-20 18:28 ` [RFC PATCH v4 11/17] ceph: decode alternate_name in lease info Jeff Layton
2021-01-20 18:28 ` [RFC PATCH v4 12/17] ceph: send altname in MClientRequest Jeff Layton
2021-01-20 18:28 ` [RFC PATCH v4 13/17] ceph: add support to readdir for encrypted filenames Jeff Layton
2021-01-28 11:33 ` Luis Henriques
2021-01-28 13:41 ` Jeff Layton
2021-01-20 18:28 ` [RFC PATCH v4 14/17] ceph: add fscrypt support to ceph_fill_trace Jeff Layton
2021-01-20 18:28 ` [RFC PATCH v4 15/17] ceph: make d_revalidate call fscrypt revalidator for encrypted dentries Jeff Layton
2021-02-01 17:18 ` Luis Henriques
2021-02-01 18:41 ` Jeff Layton
2021-01-20 18:28 ` [RFC PATCH v4 16/17] ceph: create symlinks with encrypted and base64-encoded targets Jeff Layton
2021-01-25 16:03 ` Luis Henriques
2021-01-25 18:31 ` Jeff Layton
2021-01-20 18:28 ` [RFC PATCH v4 17/17] ceph: add fscrypt ioctls Jeff Layton
2021-01-28 12:22 ` Luis Henriques
2021-01-28 13:44 ` Jeff Layton
2021-01-28 14:09 ` Luis Henriques
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=d4f84211f017280cd1dd98bcdee99d11621c5d7f.camel@kernel.org \
--to=jlayton@kernel.org \
--cc=ceph-devel@vger.kernel.org \
--cc=lhenriques@suse.de \
--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).