From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: Vivek Goyal <vgoyal@redhat.com>
Cc: dinechin@redhat.com, virtio-fs@redhat.com, qemu-devel@nongnu.org,
stefanha@redhat.com
Subject: Re: [PATCH v3 3/5] tools/virtiofsd: xattr name mappings: Map server xattr names
Date: Fri, 23 Oct 2020 15:49:12 +0100 [thread overview]
Message-ID: <20201023144912.GE3038@work-vm> (raw)
In-Reply-To: <20201022161656.GD512900@redhat.com>
* Vivek Goyal (vgoyal@redhat.com) wrote:
> On Wed, Oct 14, 2020 at 07:02:07PM +0100, Dr. David Alan Gilbert (git) wrote:
> > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> >
> > Map xattr names coming from the server, i.e. the host filesystem;
> > currently this is only from listxattr.
> >
> > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> > ---
> > tools/virtiofsd/passthrough_ll.c | 89 ++++++++++++++++++++++++++++++++
> > 1 file changed, 89 insertions(+)
> >
> > diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
> > index 57ebe17ed6..8406a2ae86 100644
> > --- a/tools/virtiofsd/passthrough_ll.c
> > +++ b/tools/virtiofsd/passthrough_ll.c
> > @@ -2220,6 +2220,43 @@ static int xattr_map_client(const struct lo_data *lo, const char *client_name,
> > }
> > }
> >
> > + /* Shouldn't get here - rules should have an END_* - check parse_xattrmap */
> > + abort();
> > +}
> > +
> > +/*
> > + * For use with listxattr where the server fs gives us a name and we may need
> > + * to sanitize this for the client.
> > + * Returns a pointer to the result in *out_name
> > + * This is always the original string or the current string with some prefix
> > + * removed; no reallocation is done.
> > + * Returns 0 on success
> > + * Can return -ENODATA to indicate the name should be dropped from the list.
> > + */
> > +static int xattr_map_server(const struct lo_data *lo, const char *server_name,
> > + const char **out_name)
> > +{
> > + const XattrMapEntry *cur_entry;
> > + const char *end;
> > +
> > + for (cur_entry = lo->xattr_map_list; ; cur_entry++) {
> > + if ((cur_entry->flags & XATTR_MAP_FLAG_SERVER) &&
> > + (strstart(server_name, cur_entry->prepend, &end))) {
> > + if (cur_entry->flags & XATTR_MAP_FLAG_END_BAD) {
> > + return -ENODATA;
> > + }
> > + if (cur_entry->flags & XATTR_MAP_FLAG_END_OK) {
> > + *out_name = server_name;
> > + return 0;
> > + }
> > + if (cur_entry->flags & XATTR_MAP_FLAG_PREFIX) {
> > + /* Remove prefix */
> > + *out_name = end;
> > + return 0;
> > + }
> > + }
> > + }
> > +
> > /* Shouldn't get here - rules should have an END_* */
> > abort();
>
> I am wondering why to put that restriction. If none of the rules match,
> can't we just return as nothing has to be done.
I always add a terminator in the parse as either a bad/ok, and was just
enforcing it - but I've changed it to a return -ENODATA that's probably
safer than the abort().
> > }
> > @@ -2378,8 +2415,60 @@ static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size)
> > if (ret == 0) {
> > goto out;
> > }
> > +
> > + if (lo->xattr_map_list) {
> > + /*
> > + * Map the names back, some attributes might be dropped,
> > + * some shortened, but not increased, so we shouldn't
> > + * run out of room.
> > + */
> > + size_t out_index, in_index;
> > + out_index = 0;
> > + in_index = 0;
> > + while (in_index < ret) {
> > + const char *map_out;
> > + char *in_ptr = value + in_index;
> > + /* Length of current attribute name */
> > + size_t in_len = strlen(value + in_index) + 1;
> > +
> > + int mapret = xattr_map_server(lo, in_ptr, &map_out);
> > + if (mapret != -ENODATA && mapret != 0) {
> > + /* Shouldn't happen */
> > + saverr = -mapret;
> > + goto out;
> > + }
> > + if (mapret == 0) {
> > + /* Either unchanged, or truncated */
> > + size_t out_len;
> > + if (map_out != in_ptr) {
> > + /* +1 copies the NIL */
> > + out_len = strlen(map_out) + 1;
> > + } else {
> > + /* No change */
> > + out_len = in_len;
> > + }
> > + /*
> > + * Move result along, may still be needed for an unchanged
> > + * entry if a previous entry was changed.
> > + */
> > + memmove(value + out_index, map_out, out_len);
> > +
> > + out_index += out_len;
> > + }
> > + in_index += in_len;
> > + }
> > + ret = out_index;
> > + if (ret == 0) {
> > + goto out;
> > + }
> > + }
> > fuse_reply_buf(req, value, ret);
> > } else {
> > + /*
> > + * xattrmap only ever shortens the result,
> > + * so we don't need to do anything clever with the
> > + * allocation length here.
> > + */
> > fuse_reply_xattr(req, ret);
>
> Hmmm.., so this code returns the length of buffer which will fit xattrs.
> So we will will changing the semantics a bit. Instead of returning
> the exact size of buffer needed, we will be returning max size. I hope
> its not a problem. Fixing it will be too expensive I guess.
Right, although the semantics are fuzzy anyway since someone can
come along and add/remove an xattr between the listxattr calls.
Dave
> Thanks
> Vivek
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
next prev parent reply other threads:[~2020-10-23 14:50 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-14 18:02 [PATCH v3 0/5] virtiofsd xattr name mappings Dr. David Alan Gilbert (git)
2020-10-14 18:02 ` [PATCH v3 1/5] tools/virtiofsd: xattr name mappings: Add option Dr. David Alan Gilbert (git)
2020-10-20 9:07 ` Stefan Hajnoczi
2020-10-21 17:13 ` Dr. David Alan Gilbert
2020-10-20 14:04 ` Vivek Goyal
2020-10-22 14:52 ` Vivek Goyal
2020-10-23 15:46 ` Dr. David Alan Gilbert
2020-10-14 18:02 ` [PATCH v3 2/5] tools/virtiofsd: xattr name mappings: Map client xattr names Dr. David Alan Gilbert (git)
2020-10-20 9:16 ` Stefan Hajnoczi
2020-10-22 15:28 ` Vivek Goyal
2020-10-23 15:04 ` Dr. David Alan Gilbert
2020-10-14 18:02 ` [PATCH v3 3/5] tools/virtiofsd: xattr name mappings: Map server " Dr. David Alan Gilbert (git)
2020-10-20 9:52 ` Stefan Hajnoczi
2020-10-22 16:16 ` Vivek Goyal
2020-10-23 14:49 ` Dr. David Alan Gilbert [this message]
2020-10-14 18:02 ` [PATCH v3 4/5] tools/virtiofsd: xattr name mapping examples Dr. David Alan Gilbert (git)
2020-10-20 9:56 ` Stefan Hajnoczi
2020-10-20 14:40 ` Vivek Goyal
2020-10-20 15:34 ` Dr. David Alan Gilbert
2020-10-20 17:56 ` Vivek Goyal
2020-10-20 19:02 ` Dr. David Alan Gilbert
2020-10-21 13:44 ` Vivek Goyal
2020-10-21 17:39 ` Dr. David Alan Gilbert
2020-10-14 18:02 ` [PATCH v3 5/5] tools/virtiofsd: xattr name mappings: Simple 'map' Dr. David Alan Gilbert (git)
2020-10-20 10:09 ` Stefan Hajnoczi
2020-10-20 11:35 ` Dr. David Alan Gilbert
2020-10-22 13:42 ` Vivek Goyal
2020-10-23 13:05 ` Dr. David Alan Gilbert
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=20201023144912.GE3038@work-vm \
--to=dgilbert@redhat.com \
--cc=dinechin@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=vgoyal@redhat.com \
--cc=virtio-fs@redhat.com \
/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).