From: Jeff Layton <jlayton@kernel.org>
To: Eric Biggers <ebiggers@kernel.org>
Cc: ceph-devel@vger.kernel.org, linux-fscrypt@vger.kernel.org,
linux-fsdevel@vger.kernel.org
Subject: Re: [RFC PATCH v3 14/16] ceph: add support to readdir for encrypted filenames
Date: Tue, 15 Sep 2020 09:27:49 -0400 [thread overview]
Message-ID: <bf448095f9d675bad3adb0ddc2d7652625824bc6.camel@kernel.org> (raw)
In-Reply-To: <20200915015719.GL899@sol.localdomain>
On Mon, 2020-09-14 at 18:57 -0700, Eric Biggers wrote:
> On Mon, Sep 14, 2020 at 03:17:05PM -0400, Jeff Layton wrote:
> > Add helper functions for buffer management and for decrypting filenames
> > returned by the MDS. Wire those into the readdir codepaths.
> >
> > Signed-off-by: Jeff Layton <jlayton@kernel.org>
> > ---
> > fs/ceph/crypto.c | 47 +++++++++++++++++++++++++++++++++++++++
> > fs/ceph/crypto.h | 35 +++++++++++++++++++++++++++++
> > fs/ceph/dir.c | 58 +++++++++++++++++++++++++++++++++++++++---------
> > fs/ceph/inode.c | 31 +++++++++++++++++++++++---
> > 4 files changed, 157 insertions(+), 14 deletions(-)
> >
> > diff --git a/fs/ceph/crypto.c b/fs/ceph/crypto.c
> > index f037a4939026..e3038c88c7a0 100644
> > --- a/fs/ceph/crypto.c
> > +++ b/fs/ceph/crypto.c
> > @@ -107,3 +107,50 @@ int ceph_fscrypt_prepare_context(struct inode *dir, struct inode *inode,
> > ceph_pagelist_release(pagelist);
> > return ret;
> > }
> > +
> > +int ceph_fname_to_usr(struct inode *parent, char *name, u32 len,
> > + struct fscrypt_str *tname, struct fscrypt_str *oname,
> > + bool *is_nokey)
> > +{
> > + int ret, declen;
> > + u32 save_len;
> > + struct fscrypt_str myname = FSTR_INIT(NULL, 0);
> > +
> > + if (!IS_ENCRYPTED(parent)) {
> > + oname->name = name;
> > + oname->len = len;
> > + return 0;
> > + }
> > +
> > + ret = fscrypt_get_encryption_info(parent);
> > + if (ret)
> > + return ret;
> > +
> > + if (tname) {
> > + save_len = tname->len;
> > + } else {
> > + int err;
> > +
> > + save_len = 0;
> > + err = fscrypt_fname_alloc_buffer(NAME_MAX, &myname);
> > + if (err)
> > + return err;
> > + tname = &myname;
>
> The 'err' variable isn't needed, since 'ret' can be used instead.
>
> > + }
> > +
> > + declen = fscrypt_base64_decode(name, len, tname->name);
> > + if (declen < 0 || declen > NAME_MAX) {
> > + ret = -EIO;
> > + goto out;
> > + }
>
> declen <= 0, to cover the empty name case.
>
> Also, is there a point in checking for > NAME_MAX?
>
IDK. We're getting these strings from the MDS and they could end up
being corrupt if there are bugs there (or if the MDS is compromised).
Of course, if we get a name longer than NAME_MAX then we've overrun the
buffer.
Maybe we should add a maxlen parameter to fscrypt_base64_encode/decode ?
Or maybe I should just have fscrypt_fname_alloc_buffer allocate a buffer
the same size as "len"? It might be a little larger than necessary, but
that would be safer.
> > +
> > + tname->len = declen;
> > +
> > + ret = fscrypt_fname_disk_to_usr(parent, 0, 0, tname, oname, is_nokey);
> > +
> > + if (save_len)
> > + tname->len = save_len;
>
> This logic for temporarily overwriting the length is weird.
> How about something like the following instead:
>
Yeah, it is odd. I think I got spooked by the way that length in struct
fscrypt_str is handled.
Some functions treat it as representing the length of the allocated
buffer (e.g. fscrypt_fname_alloc_buffer), but others treat it as
representing the length of the string in ->name (e.g.
fscrypt_encode_nokey_name).
Your suggestion works around that though, so I'll probably adopt
something like it. Thanks!
> int ceph_fname_to_usr(struct inode *parent, char *name, u32 len,
> struct fscrypt_str *tname, struct fscrypt_str *oname,
> bool *is_nokey)
> {
> int err, declen;
> struct fscrypt_str _tname = FSTR_INIT(NULL, 0);
> struct fscrypt_str iname;
>
> if (!IS_ENCRYPTED(parent)) {
> oname->name = name;
> oname->len = len;
> return 0;
> }
>
> err = fscrypt_get_encryption_info(parent);
> if (err)
> return err;
>
> if (!tname) {
> err = fscrypt_fname_alloc_buffer(NAME_MAX, &_tname);
> if (err)
> return err;
> tname = &_tname;
> }
>
> declen = fscrypt_base64_decode(name, len, tname->name);
> if (declen <= 0) {
> err = -EIO;
> goto out;
> }
>
> iname.name = tname->name;
> iname.len = declen;
> err = fscrypt_fname_disk_to_usr(parent, 0, 0, &iname, oname, is_nokey);
> out:
> fscrypt_fname_free_buffer(&_tname);
> return err;
> }
--
Jeff Layton <jlayton@kernel.org>
next prev parent reply other threads:[~2020-09-15 13:51 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-14 19:16 [RFC PATCH v3 00/16] ceph+fscrypt: context, filename and symlink support Jeff Layton
2020-09-14 19:16 ` [RFC PATCH v3 01/16] vfs: export new_inode_pseudo Jeff Layton
2020-09-14 23:33 ` Eric Biggers
2020-09-23 3:41 ` Al Viro
2020-09-23 11:19 ` Jeff Layton
2020-09-14 19:16 ` [RFC PATCH v3 02/16] fscrypt: export fscrypt_base64_encode and fscrypt_base64_decode Jeff Layton
2020-09-14 23:44 ` Eric Biggers
2020-09-14 19:16 ` [RFC PATCH v3 03/16] fscrypt: export fscrypt_d_revalidate Jeff Layton
2020-09-15 0:04 ` Eric Biggers
2020-09-14 19:16 ` [RFC PATCH v3 04/16] fscrypt: add fscrypt_context_for_new_inode Jeff Layton
2020-09-15 0:15 ` Eric Biggers
2020-09-14 19:16 ` [RFC PATCH v3 05/16] fscrypt: make fscrypt_fname_disk_to_usr return whether result is nokey name Jeff Layton
2020-09-15 0:23 ` Eric Biggers
2020-09-14 19:16 ` [RFC PATCH v3 06/16] ceph: add fscrypt ioctls Jeff Layton
2020-09-15 0:45 ` Eric Biggers
2020-09-15 12:08 ` Jeff Layton
2020-09-14 19:16 ` [RFC PATCH v3 07/16] ceph: crypto context handling for ceph Jeff Layton
2020-09-15 1:00 ` Eric Biggers
2020-09-14 19:16 ` [RFC PATCH v3 08/16] ceph: implement -o test_dummy_encryption mount option Jeff Layton
2020-09-15 1:23 ` Eric Biggers
2020-09-16 12:49 ` Jeff Layton
2020-09-14 19:17 ` [RFC PATCH v3 09/16] ceph: preallocate inode for ops that may create one Jeff Layton
2020-09-15 1:30 ` Eric Biggers
2020-09-16 12:41 ` Jeff Layton
2020-09-14 19:17 ` [RFC PATCH v3 10/16] ceph: add routine to create context prior to RPC Jeff Layton
2020-09-15 1:37 ` Eric Biggers
2020-09-16 12:18 ` Jeff Layton
2020-09-14 19:17 ` [RFC PATCH v3 11/16] ceph: make ceph_msdc_build_path use ref-walk Jeff Layton
2020-09-14 19:17 ` [RFC PATCH v3 12/16] ceph: add encrypted fname handling to ceph_mdsc_build_path Jeff Layton
2020-09-15 1:41 ` Eric Biggers
2020-09-16 12:30 ` Jeff Layton
2020-09-16 17:36 ` Eric Biggers
2020-09-16 18:04 ` Jeff Layton
2020-09-16 18:42 ` Eric Biggers
2020-09-14 19:17 ` [RFC PATCH v3 13/16] ceph: make d_revalidate call fscrypt revalidator for encrypted dentries Jeff Layton
2020-09-14 19:17 ` [RFC PATCH v3 14/16] ceph: add support to readdir for encrypted filenames Jeff Layton
2020-09-15 1:57 ` Eric Biggers
2020-09-15 13:27 ` Jeff Layton [this message]
2020-09-15 20:40 ` Eric Biggers
2020-09-16 12:16 ` Jeff Layton
2020-09-14 19:17 ` [RFC PATCH v3 15/16] ceph: add fscrypt support to ceph_fill_trace Jeff Layton
2020-09-14 19:17 ` [RFC PATCH v3 16/16] ceph: create symlinks with encrypted and base64-encoded targets Jeff Layton
2020-09-15 2:07 ` Eric Biggers
2020-09-15 14:05 ` Jeff Layton
2020-09-15 20:49 ` Eric Biggers
2020-09-16 12:15 ` Jeff Layton
2020-09-15 2:13 ` [RFC PATCH v3 00/16] ceph+fscrypt: context, filename and symlink support Eric Biggers
2020-09-15 13:38 ` 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=bf448095f9d675bad3adb0ddc2d7652625824bc6.camel@kernel.org \
--to=jlayton@kernel.org \
--cc=ceph-devel@vger.kernel.org \
--cc=ebiggers@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).