virtiofsd xattr name mappings
v2 cover virtiofsd xattr name mappings
From: "Dr. David Alan Gilbert" <[email protected]>
This is a second cut of a xattr name mapping option for virtiofsd.
It allows the user of virtiofsd to define a fairly flexible mapping from the view of the xattr names the host fs has and the ones that the guest sees.
The hope is this allows things like:
a) Different selinux attributes on host/guest
b) separation of trusted. attributes that clash on overlayfs
c) support for privileged xattr's in guests running with an unprivileged virtiofsd.
There's no apparent standard for this kind of mapping, so I made it flexible by specifying a mapping rule in the option.
Prefix's can be added (selectively or globally), xattr's can be dropped in either direction or passed through.
Dave
v2
Switch from cryptic single letter codes to full words in rules Allow rules to use any separator character
Add examples to doc
Add a couple of fixups for a gcc warning and make gcc spot my format errors.
Dr. David Alan Gilbert (6):
virtiofsd: Silence gcc warning
virtiofsd: Add printf checking to fuse_log tools/virtiofsd: xattr name mappings: Add option tools/virtiofsd: xattr name mappings: Map client xattr names tools/virtiofsd: xattr name mappings: Map server xattr names tools/virtiofsd: xattr name mapping examples
docs/tools/virtiofsd.rst | 104 ++++++++++ tools/virtiofsd/fuse_log.h | 2 + tools/virtiofsd/passthrough_ll.c | 340 ++++++++++++++++++++++++++++++- 3 files changed, 442 insertions(+), 4 deletions(-)
Signature · 1 line
2.26.2
PATCH v2 1/6 virtiofsd: Silence gcc warning
From: "Dr. David Alan Gilbert" <[email protected]>
Gcc worries fd might be used unset, in reality it's always set if fi is set, and only used if fi is set so it's safe. Initialise it to -1 just to keep gcc happy for now.
--- tools/virtiofsd/passthrough_ll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/virtiofsd/passthrough_ll.c +1 -1
@@ -617,7 +617,7 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino, struct stat *attr,struct lo_inode *inode;int ifd;int res; -int fd; +int fd =-1 ; inode =lo_inode (req, ino);if (!inode) {
Signature · 1 line
2.26.2
Re: [PATCH v2 1/6] virtiofsd: Silence gcc warning
Quoted 11 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Gcc worries fd might be used unset, in reality it's always set if fi is set, and only used if fi is set so it's safe. Initialise it to -1 just to keep gcc happy for now.
Signed-off-by Dr. David Alan Gilbert <[email protected]>---
tools/virtiofsd/passthrough_ll.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)
Jano
Re: [PATCH v2 1/6] virtiofsd: Silence gcc warning
In reply to Dr. David Alan Gilbert (git)Quoted 7 lines · * Dr. David Alan Gilbert (git) ([email protected]) wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
Gcc worries fd might be used unset, in reality it's always set if fi is set, and only used if fi is set so it's safe. Initialise it to -1 just to keep gcc happy for now.
Signed-off-by Dr. David Alan Gilbert <[email protected]>
Queued (just this patch)
Quoted 21 lines
--- tools/virtiofsd/passthrough_ll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/virtiofsd/passthrough_ll.c +1
-1@@ -617,7 +617,7 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino, struct stat *attr,struct lo_inode *inode;int ifd;int res; -int fd; +int fd =-1 ; inode =lo_inode (req, ino);if (!inode) {Signature · 1 line
2.26.2
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
PATCH v2 2/6 virtiofsd: Add printf checking to fuse_log
In reply to Dr. David Alan Gilbert (git)From: "Dr. David Alan Gilbert" <[email protected]>
Use qemu's GCC_FMT_ATTR to add printf style checking to fuse_log.
--- tools/virtiofsd/fuse_log.h | 2 ++ 1 file changed, 2 insertions(+)
tools/virtiofsd/fuse_log.h +2 -0
@@ -15,6 +15,7 @@*/ #include <stdarg.h> +#include "qemu/compiler.h" /** * Log severity level
@@ -69,6 +70,7 @@ void fuse_set_log_func(fuse_log_func_t func);* @param level severity level (FUSE_LOG_ERR, FUSE_LOG_DEBUG, etc) * @param fmt sprintf-style format string including newline */ +GCC_FMT_ATTR(2, 3)void fuse_log (enum fuse_log_level level,const char *fmt, ...);#endif /* FUSE_LOG_H_ */
Signature · 1 line
2.26.2
PATCH v2 3/6 tools/virtiofsd: xattr name mappings: Add option
In reply to Dr. David Alan Gilbert (git)From: "Dr. David Alan Gilbert" <[email protected]>
Add an option to define mappings of xattr names so that the client and server filesystems see different views. This can be used to have different SELinux mappings as seen by the guest, to run the virtiofsd with less privileges (e.g. in a case where it can't set trusted/system/security xattrs but you want the guest to be able to), or to isolate multiple users of the same name; e.g. trusted attributes used by stacking overlayfs.
A mapping engine is used wit 3 simple rules; the rules can be combined to allow most useful mapping scenarios. The ruleset is defined by -o xattrmap='rules...'.
This patch doesn't use the rule maps yet.
--- docs/tools/virtiofsd.rst | 55 ++++++++++++ tools/virtiofsd/passthrough_ll.c | 148 +++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+)
docs/tools/virtiofsd.rst +55 -0
@@ -107,6 +107,60 @@ Options performance. ``auto`` acts similar to NFS with a 1 second metadata cache timeout. ``always`` sets a long cache lifetime at the expense of coherency. +xattr-mapping +------------- + +By default the name of xattr's used by the client are passed through to the server +file system. This can be a problem where either those xattr names are used +by something on the server (e.g. selinux client/server confusion) or if the +virtiofsd is running in a container with restricted priviliges where it cannot +access some attributes. + +A mapping of xattr names can be made using -o xattrmap=mapping where the ``mapping`` +string consists of a series of rules. + +The first matching rule terminates the mapping. + +Each rule consists of a number of fields separated with a separator that is the +first non-white space character in the rule. This separator must then be used +for the whole rule. +White space may be added before and after each rule. +Using ':' as the separator a rule is of the form: + +``:scope:type:key:prepend:`` + +**scope** is: + +- 'client' - match 'key' against a xattr name from the client for + setxattr/getxattr/removexattr +- 'server' - match 'prepend' against a xattr name from the server + for listxattr +- 'all' - can be used to match both cases. + +**type** is one of: + +- 'prefix' - If 'key' matches the client then the 'prepend' + is added before the name is passed to the server. + For a server case, the prepend is tested and stripped + if matching. + +- 'ok' - The attribute name is OK and passed through to + the server unchanged. + +- 'bad' - If a client tries to use this name it's + denied using EPERM; when the server passes an attribute + name matching it's hidden. + +**key** is a string tested as a prefix on an attribute name originating +on the client. It maybe empty in which case a 'client' rule +will always match on client names. + +**prepend** is a string tested as a prefix on an attribute name originiating +on the server, and used as a new prefix. It maybe empty +in which case a 'server' rule will always match on all names from +the server. + + Examples --------
@@ -123,3 +177,4 @@ Export ``/var/lib/fs/vm001/`` on vhost-user UNIX domain socket -numa node,memdev=mem \ ... guest# mount -t virtiofs myfs /mnt +
tools/virtiofsd/passthrough_ll.c +148 -0
178 lines not on this page · raw message
Signature · 1 line
2.26.2
Re: [PATCH v2 3/6] tools/virtiofsd: xattr name mappings: Add option
Quoted 28 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Add an option to define mappings of xattr names so that the client and server filesystems see different views. This can be used to have different SELinux mappings as seen by the guest, to run the virtiofsd with less privileges (e.g. in a case where it can't set trusted/system/security xattrs but you want the guest to be able to), or to isolate multiple users of the same name; e.g. trusted attributes used by stacking overlayfs.
A mapping engine is used wit 3 simple rules; the rules can be combined to allow most useful mapping scenarios. The ruleset is defined by -o xattrmap='rules...'.
This patch doesn't use the rule maps yet.
Signed-off-by Dr. David Alan Gilbert <[email protected]>---
docs/tools/virtiofsd.rst| 55 ++++++++++++tools/virtiofsd/passthrough_ll.c| 148 +++++++++++++++++++++++++++++++2 files changed, 203 insertions(+)docs/tools/virtiofsd.rst +0
-0
docs/tools/virtiofsd.rst Options · line 116
Quoted 10 lines
docs/tools/virtiofsd.rst +7
-0@@ -107,6 +107,60 @@ Options performance. ``auto`` acts similar to NFS with a 1 second metadata cache timeout. ``always`` sets a long cache lifetime at the expense of coherency. +xattr-mapping +------------- + +By default the name of xattr's used by the client are passed through to the server +file system. This can be a problem where either those xattr names are used +by something on the server (e.g. selinux client/server confusion) or if the +virtiofsd is running in a container with restricted priviliges where it cannot
privileges
Quoted 32 lines
docs/tools/virtiofsd.rst +32
-0+access some attributes. + +A mapping of xattr names can be made using -o xattrmap=mapping where the ``mapping`` +string consists of a series of rules. + +The first matching rule terminates the mapping. + +Each rule consists of a number of fields separated with a separator that is the +first non-white space character in the rule. This separator must then be used +for the whole rule. +White space may be added before and after each rule. +Using ':' as the separator a rule is of the form: + +``:scope:type:key:prepend:`` + +**scope** is: + +- 'client' - match 'key' against a xattr name from the client for + setxattr/getxattr/removexattr +- 'server' - match 'prepend' against a xattr name from the server + for listxattr +- 'all' - can be used to match both cases. + +**type** is one of: + +- 'prefix' - If 'key' matches the client then the 'prepend' + is added before the name is passed to the server. + For a server case, the prepend is tested and stripped + if matching. + +- 'ok' - The attribute name is OK and passed through to + the server unchanged.
docs/tools/virtiofsd.rst Options · line 158
Quoted 10 lines
docs/tools/virtiofsd.rst +10
-0+ +- 'bad' - If a client tries to use this name it's + denied using EPERM; when the server passes an attribute + name matching it's hidden. + +**key** is a string tested as a prefix on an attribute name originating +on the client. It maybe empty in which case a 'client' rule +will always match on client names. + +**prepend** is a string tested as a prefix on an attribute name originiating
originating
docs/tools/virtiofsd.rst Options · line 159
Quoted 1 line
docs/tools/virtiofsd.rst +1
-0+on the server, and used as a new prefix. It maybe empty
may be
docs/tools/virtiofsd.rst Export ``/var/lib/fs/vm001/`` on vhost-user UNIX domain socket · line 180
Quoted 12 lines
docs/tools/virtiofsd.rst +4
-0+in which case a 'server' rule will always match on all names from +the server. + +Examples
--------docs/tools/virtiofsd.rst +1
-0@@ -123,3 +177,4 @@ Export ``/var/lib/fs/vm001/`` on vhost-user UNIX domain socket -numa node,memdev=mem \ guest# mount -t virtiofs myfs /mnt +
git complains about trailing whitespace at EOF
Jano
Re: [PATCH v2 3/6] tools/virtiofsd: xattr name mappings: Add option
Quoted 32 lines · * Ján Tomko ([email protected]) wrote:
Quoted 31 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Add an option to define mappings of xattr names so that the client and server filesystems see different views. This can be used to have different SELinux mappings as seen by the guest, to run the virtiofsd with less privileges (e.g. in a case where it can't set trusted/system/security xattrs but you want the guest to be able to), or to isolate multiple users of the same name; e.g. trusted attributes used by stacking overlayfs.
A mapping engine is used wit 3 simple rules; the rules can be combined to allow most useful mapping scenarios. The ruleset is defined by -o xattrmap='rules...'.
This patch doesn't use the rule maps yet.
Signed-off-by Dr. David Alan Gilbert <[email protected]>---
docs/tools/virtiofsd.rst| 55 ++++++++++++tools/virtiofsd/passthrough_ll.c| 148 +++++++++++++++++++++++++++++++2 files changed, 203 insertions(+)docs/tools/virtiofsd.rst +0
-0@@ -107,6 +107,60 @@ Options performance. ``auto`` acts similar to NFS with a 1 second metadata cache timeout. ``always`` sets a long cache lifetime at the expense of coherency.
Quoted 9 lines
docs/tools/virtiofsd.rst Options · line 116
Quoted 7 lines
docs/tools/virtiofsd.rst +7
-0+xattr-mapping +------------- + +By default the name of xattr's used by the client are passed through to the server +file system. This can be a problem where either those xattr names are used +by something on the server (e.g. selinux client/server confusion) or if the +virtiofsd is running in a container with restricted priviliges where it cannotprivileges
Fixed.
Quoted 36 lines
Quoted 36 lines
docs/tools/virtiofsd.rst +36
-0+access some attributes. + +A mapping of xattr names can be made using -o xattrmap=mapping where the ``mapping`` +string consists of a series of rules. + +The first matching rule terminates the mapping. + +Each rule consists of a number of fields separated with a separator that is the +first non-white space character in the rule. This separator must then be used +for the whole rule. +White space may be added before and after each rule. +Using ':' as the separator a rule is of the form: + +``:scope:type:key:prepend:`` + +**scope** is: + +- 'client' - match 'key' against a xattr name from the client for + setxattr/getxattr/removexattr +- 'server' - match 'prepend' against a xattr name from the server + for listxattr +- 'all' - can be used to match both cases. + +**type** is one of: + +- 'prefix' - If 'key' matches the client then the 'prepend' + is added before the name is passed to the server. + For a server case, the prepend is tested and stripped + if matching. + +- 'ok' - The attribute name is OK and passed through to + the server unchanged. + +- 'bad' - If a client tries to use this name it's + denied using EPERM; when the server passes an attribute + name matching it's hidden.
Quoted 8 lines
docs/tools/virtiofsd.rst Options · line 158
Quoted 6 lines
docs/tools/virtiofsd.rst +6
-0+ +**key** is a string tested as a prefix on an attribute name originating +on the client. It maybe empty in which case a 'client' rule +will always match on client names. + +**prepend** is a string tested as a prefix on an attribute name originiatingoriginating
Done.
Quoted 3 lines
docs/tools/virtiofsd.rst Options · line 159
Quoted 1 line
docs/tools/virtiofsd.rst +1
-0+on the server, and used as a new prefix. It maybe emptymay be
OK
Quoted 7 lines
Quoted 7 lines
docs/tools/virtiofsd.rst +4
-0+in which case a 'server' rule will always match on all names from +the server. + +Examples
--------
Quoted 7 lines
docs/tools/virtiofsd.rst Export ``/var/lib/fs/vm001/`` on vhost-user UNIX domain socket · line 180
Quoted 5 lines
docs/tools/virtiofsd.rst +1
-0@@ -123,3 +177,4 @@ Export ``/var/lib/fs/vm001/`` on vhost-user UNIX domain socket -numa node,memdev=mem \ guest# mount -t virtiofs myfs /mnt +git complains about trailing whitespace at EOF
Eaten.
Dave
Quoted 1 line
Jano
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [Virtio-fs] [PATCH v2 3/6] tools/virtiofsd: xattr name mappings: Add option
In reply to Dr. David Alan Gilbert (git)Quoted 42 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Add an option to define mappings of xattr names so that the client and server filesystems see different views. This can be used to have different SELinux mappings as seen by the guest, to run the virtiofsd with less privileges (e.g. in a case where it can't set trusted/system/security xattrs but you want the guest to be able to), or to isolate multiple users of the same name; e.g. trusted attributes used by stacking overlayfs.
A mapping engine is used wit 3 simple rules; the rules can be combined to allow most useful mapping scenarios. The ruleset is defined by -o xattrmap='rules...'.
This patch doesn't use the rule maps yet.
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- docs/tools/virtiofsd.rst | 55 ++++++++++++ tools/virtiofsd/passthrough_ll.c | 148 +++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+)docs/tools/virtiofsd.rst +11
-0@@ -107,6 +107,60 @@ Options performance. ``auto`` acts similar to NFS with a 1 second metadata cache timeout. ``always`` sets a long cache lifetime at the expense of coherency. +xattr-mapping +------------- + +By default the name of xattr's used by the client are passed through to the server +file system. This can be a problem where either those xattr names are used +by something on the server (e.g. selinux client/server confusion) or if the +virtiofsd is running in a container with restricted priviliges where it cannot +access some attributes. + +A mapping of xattr names can be made using -o xattrmap=mapping where the ``mapping`` +string consists of a series of rules.
docs/tools/virtiofsd.rst Options · line 130
Quoted 10 lines
docs/tools/virtiofsd.rst +10
-0+ +The first matching rule terminates the mapping. + +Each rule consists of a number of fields separated with a separator that is the +first non-white space character in the rule. This separator must then be used +for the whole rule. +White space may be added before and after each rule. +Using ':' as the separator a rule is of the form: + +``:scope:type:key:prepend:``
Hi David,
This seems very genric and which makes it harder to understand and harder to write rules. I am wondering do we really need this degree of flexibility. Is it worth, dropping some of the requirements and simplify the syntax.
- I am wonderig why do we need to allow choice of separator.
- Wondering why do we need to allow separate rules for client/server. Once we start remapping something, is it not good enough that mapping be bidirectonal.
- Not sure why separate notion of "bad". To me once we decide to remap something, should automatically block unprefixed version.
IOW, what functionality we will lose if we just say
-o remap_xattr="trusted.".
This implies following.
A. If client is sending any xattr prefixed with "trusted.", prefix it with "user.virtiofs".
B. Server filters out anything starting with "trusted."
C. If server sees "user.virtiofs.trusted." it strips "user.virtiofs".
For remapping security.selinux, user could specify.
-o remap_xattr="security.selinux."
For nested configuration. virtiofsd at L1 will specify.
-o remap_xattr="security.selinux.".
And virtiofsd at L0 can specify.
-o remap_xattr="user.virtiofs.security.selinux."
I doubt we need to care about being able to remap xattrs of other filesystems like virtio-9p.
I also have some questions about how this will be used.
Overlay
-------
- So for non nested guests, we can have two instances of overlay. Lets call these ovl0 and ovl1. (ovl0 being on host, and ovl1 being inside guest). Fs hierarcy might look as follows.
ext4-->ovl0-->virtiofsd0-->ovl1
This case does not work by default even if virtiofsd has CAP_SYS_ADMIN by default as overlay does not allow nesting. So when ovl1 tries to set trusted.overlay, ovl0 will deny it.
We could simple pass extra directory from host which does not go through overlay on host and use that as upper inside guest.
ext4-->ovl0-->virtiofsd0-->ovl1
ext4-->ovl0/upper-->virtiofsd0-->ovl1
(/upper used as upper directory of ovl1)
I guess remapping "trusted.overlay" will allow us not to have a separate ovl0/upper. And following itself will work. Have you tested it? Does this work. Basically we are creating nested overlay configuration with virtiofs in between. Is "trusted.overlay" only conflict. I wonder there might be others. Just that "trusted.overlay" is first failure we noticed.
Nested Overlay
--------------
- For now I will assume that we are using separate upper dir.
ext4-->ovl0-->virtiofsd0-->ovl1-->virtiofsd1-->ovl2 ext4-->ovl0/upper1-->virtiofsd0-->ovl1(uses upper1 as upperdir) ext4-->ovl0/upper2-->virtiofsd0-->ovl1-->virtiofsd1-->ovl2 (users upper2 as upper dir)
Basically create two directories upper1 and upper2 on regular filesystem say ext4/xfs. Bind mount them on ovl0/upper1 and ovl0/upper2 respectively. And now ovl1 uses ovl0/upper1 as upperdir and ovl2 uses ovl0/upper2 as upperdir. This should make sure ovl0, ovl1 and ovl2 are not nested from sharing upper perspective.
Now virtiofsd1 will run with '-o remap_xattr="trusted.overlay"' and virtiofsd0 will run with '-o remap_xattr="user.virtiofs.trusted.overlay"'
Just trying to wrap my head around how our use cases will use this new remapping xattr thing.
Thanks
Vivek
Quoted 235 lines
docs/tools/virtiofsd.rst +34
-0+ +**scope** is: + +- 'client' - match 'key' against a xattr name from the client for + setxattr/getxattr/removexattr +- 'server' - match 'prepend' against a xattr name from the server + for listxattr +- 'all' - can be used to match both cases. + +**type** is one of: + +- 'prefix' - If 'key' matches the client then the 'prepend' + is added before the name is passed to the server. + For a server case, the prepend is tested and stripped + if matching. + +- 'ok' - The attribute name is OK and passed through to + the server unchanged. + +- 'bad' - If a client tries to use this name it's + denied using EPERM; when the server passes an attribute + name matching it's hidden. + +**key** is a string tested as a prefix on an attribute name originating +on the client. It maybe empty in which case a 'client' rule +will always match on client names. + +**prepend** is a string tested as a prefix on an attribute name originiating +on the server, and used as a new prefix. It maybe empty +in which case a 'server' rule will always match on all names from +the server. + + Examples --------@@ -123,3 +177,4 @@ Export ``/var/lib/fs/vm001/`` on vhost-user UNIX domain socket -numa node,memdev=mem \ guest# mount -t virtiofs myfs /mnt +tools/virtiofsd/passthrough_ll.c +148
-0@@ -64,6 +64,7 @@#include <syslog.h> #include <unistd.h> +#include "qemu/cutils.h" #include "passthrough_helpers.h" #include "passthrough_seccomp.h" @@ -144,6 +145,7 @@ struct lo_data {int flock;int posix_lock;int xattr; +char *xattrmap;char *source;char *modcaps;double timeout;@@ -171,6 +173,7 @@ static const struct fuse_opt lo_opts[] = { { "no_posix_lock", offsetof(struct lo_data, posix_lock), 0 }, { "xattr", offsetof(struct lo_data, xattr), 1 }, { "no_xattr", offsetof(struct lo_data, xattr), 0 }, + { "xattrmap=%s", offsetof(struct lo_data, xattrmap), 0 }, { "modcaps=%s", offsetof(struct lo_data, modcaps), 0 }, { "timeout=%lf", offsetof(struct lo_data, timeout), 0 }, { "timeout=", offsetof(struct lo_data, timeout_set), 1 },@@ -2003,6 +2006,146 @@ static void lo_flock(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi,fuse_reply_err (req, res ==-1 ? errno :0 ); } +typedef struct xattr_map_entry { +const char *key; +const char *prepend; +unsigned int flags; +}XattrMapEntry ; + +/* +* Exit; process attribute unmodified if matched. +* An empty key applies to all. +*/ +#define XATTR_MAP_FLAG_END_OK (1 << 0) +/* +* The attribute is unwanted; +* EPERM on write hidden on read. +*/ +#define XATTR_MAP_FLAG_END_BAD (1 << 1) +/* +* For attr that start with 'key' prepend 'prepend' +* 'key' maybe empty to prepend for all attrs +* key is defined from set/remove point of view. +* Automatically reversed on read +*/ +#define XATTR_MAP_FLAG_PREFIX (1 << 2) +/* Apply rule to get/set/remove */ +#define XATTR_MAP_FLAG_CLIENT (1 << 16) +/* Apply rule to list */ +#define XATTR_MAP_FLAG_SERVER (1 << 17) +/* Apply rule to all */ +#define XATTR_MAP_FLAG_ALL (XATTR_MAP_FLAG_SERVER | XATTR_MAP_FLAG_CLIENT) + +static XattrMapEntry *xattr_map_list; + +static XattrMapEntry *parse_xattrmap (const char *map) +{ +XattrMapEntry *res =NULL ; +size_t nentries =0 ; +const char *tmp; + +while (*map) { +char sep; + +if (isspace (*map)) { + map++; +continue ; + } +/* The separator is the first non-space of the rule */ + sep = *map++; +if (!sep) { +break ; + } + +/* Allocate some space for the rule */ + res =g_realloc_n (res, ++nentries,sizeof (XattrMapEntry)); + res[nentries -1 ].flags =0 ; + +if (strstart (map,"client" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_CLIENT ; + }else if (strstart (map,"server" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_SERVER ; + }else if (strstart (map,"all" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_ALL ; + }else { +fuse_log (FUSE_LOG_ERR , +"%s: Unexpected scope;" +" Expecting 'client', 'server', or 'all', in rule %zu\n" , + __func__, nentries); +exit (1 ); + } + + +if (*map != sep) { +fuse_log (FUSE_LOG_ERR , +"%s: Expecting '%c' found '%c'" +" after scope in rule %zu\n" , + __func__, sep, *map, nentries +1 ); +exit (1 ); + } +/* Skip the separator, now at the start of the 'type' */ + map++; + +/* Start of 'type' */ +if (strstart (map,"prefix" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_PREFIX ; + }else if (strstart (map,"ok" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_END_OK ; + }else if (strstart (map,"bad" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_END_BAD ; + }else { +fuse_log (FUSE_LOG_ERR , +"%s: Unexpected type;" +"Expecting 'prefix', 'ok', or 'bad' in rule %zu\n" , + __func__, nentries); +exit (1 ); + } + +if (*map++ != sep) { +fuse_log (FUSE_LOG_ERR , +"%s: Missing '%c' at end of type field of rule %zu\n" , + __func__, sep, nentries); +exit (1 ); + } + +/* At start of 'key' field */ + tmp =strchr (map, sep); +if (!tmp) { +fuse_log (FUSE_LOG_ERR , +"%s: Missing '%c' at end of key field of rule %zu" , + __func__, sep, nentries); +exit (1 ); + } + res[nentries -1 ].key =g_strndup (map, tmp - map); + map = tmp +1 ; + +/* At start of 'prepend' field */ + tmp =strchr (map, sep); +if (!tmp) { +fuse_log (FUSE_LOG_ERR , +"%s: Missing '%c' at end of prepend field of rule %zu" , + __func__, sep, nentries); +exit (1 ); + } + res[nentries -1 ].prepend =g_strndup (map, tmp - map); + map = tmp +1 ; +/* End of rule - go around again for another rule */ + } + +if (!nentries) { +fuse_log (FUSE_LOG_ERR ,"Empty xattr map\n" ); +exit (1 ); + } + +/* Add a terminator to error in cases the user hasn't specified */ + res =g_realloc_n (res, ++nentries,sizeof (XattrMapEntry)); + res[nentries -1 ].flags =XATTR_MAP_FLAG_ALL |XATTR_MAP_FLAG_END_BAD ; + res[nentries -1 ].key =g_strdup ("" ); + res[nentries -1 ].prepend =g_strdup ("" ); + +return res; +} +static void lo_getxattr (fuse_req_t req,fuse_ino_t ino,const char *name,size_t size) {@@ -2909,6 +3052,11 @@ int main(int argc, char *argv[]) }else { lo.source =strdup ("/" ); } + +if (lo.xattrmap) { + xattr_map_list =parse_xattrmap (lo.xattrmap); + } +if (!lo.timeout_set) {switch (lo.cache) {case CACHE_NONE :Signature · 6 lines
2.26.2 _______________________________________________ Virtio-fs mailing list [email protected] https://www.redhat.com/mailman/listinfo/virtio-fs
Re: [Virtio-fs] [PATCH v2 3/6] tools/virtiofsd: xattr name mappings: Add option
Quoted 56 lines · * Vivek Goyal ([email protected]) wrote:
Quoted 42 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Add an option to define mappings of xattr names so that the client and server filesystems see different views. This can be used to have different SELinux mappings as seen by the guest, to run the virtiofsd with less privileges (e.g. in a case where it can't set trusted/system/security xattrs but you want the guest to be able to), or to isolate multiple users of the same name; e.g. trusted attributes used by stacking overlayfs.
A mapping engine is used wit 3 simple rules; the rules can be combined to allow most useful mapping scenarios. The ruleset is defined by -o xattrmap='rules...'.
This patch doesn't use the rule maps yet.
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- docs/tools/virtiofsd.rst | 55 ++++++++++++ tools/virtiofsd/passthrough_ll.c | 148 +++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+)docs/tools/virtiofsd.rst +11
-0@@ -107,6 +107,60 @@ Options performance. ``auto`` acts similar to NFS with a 1 second metadata cache timeout. ``always`` sets a long cache lifetime at the expense of coherency. +xattr-mapping +------------- + +By default the name of xattr's used by the client are passed through to the server +file system. This can be a problem where either those xattr names are used +by something on the server (e.g. selinux client/server confusion) or if the +virtiofsd is running in a container with restricted priviliges where it cannot +access some attributes. + +A mapping of xattr names can be made using -o xattrmap=mapping where the ``mapping`` +string consists of a series of rules.docs/tools/virtiofsd.rst Options · line 130
Quoted 10 lines
docs/tools/virtiofsd.rst +10
-0+ +The first matching rule terminates the mapping. + +Each rule consists of a number of fields separated with a separator that is the +first non-white space character in the rule. This separator must then be used +for the whole rule. +White space may be added before and after each rule. +Using ':' as the separator a rule is of the form: + +``:scope:type:key:prepend:``Hi David,
Quoted 4 lines
This seems very genric and which makes it harder to understand and harder to write rules. I am wondering do we really need this degree of flexibility. Is it worth, dropping some of the requirements and simplify the syntax.
I'm wondering perhaps if we could solve this by adding sugared simple versions but leaving the flexible syntax for those who need it.
Quoted 1 line
- I am wonderig why do we need to allow choice of separator.
I didnd't have that at first, but it was simple to add and solves the problem of if you have the separator in the string you want to substitute.
Quoted 6 lines
- Wondering why do we need to allow separate rules for client/server. Once we start remapping something, is it not good enough that mapping be bidirectonal.
- Not sure why separate notion of "bad". To me once we decide to remap something, should automatically block unprefixed version.
I wanted to be able to block things rather than remap; for example just to block 'trusted.'
Quoted 4 lines
IOW, what functionality we will lose if we just say
-o remap_xattr="trusted.".
Quoted 8 lines
This implies following.
A. If client is sending any xattr prefixed with "trusted.", prefix it with "user.virtiofs".
B. Server filters out anything starting with "trusted."
C. If server sees "user.virtiofs.trusted." it strips "user.virtiofs".
Don't forget you also have to stop the client explicitly sending 'user.virtiofs.trusted'; that would let an unpriv client process overwrite the prefixed name.
Quoted 11 lines
For remapping security.selinux, user could specify.
-o remap_xattr="security.selinux."
For nested configuration. virtiofsd at L1 will specify.
-o remap_xattr="security.selinux.".
And virtiofsd at L0 can specify.
-o remap_xattr="user.virtiofs.security.selinux."
I think you're saying that means it needs to know if it's L0 or L1 which is a shame; ideally you'd be able to have something that transparently worked at either.
In your scheme how do I do both the 'trusted.' and 'security.selinux.' stuff?
Quoted 2 lines
I doubt we need to care about being able to remap xattrs of other filesystems like virtio-9p.
Well that's the thing; there's at least 9p and crosvm's setup; both of which are different, and it would make sense if someone wanted to transition their existing on disk container to a virtiofs setup from a 9p setup without having to change all their xattr's. That was my main reason for wanting the flexibility.
Quoted 14 lines
I also have some questions about how this will be used.
Overlay
-------
- So for non nested guests, we can have two instances of overlay. Lets call these ovl0 and ovl1. (ovl0 being on host, and ovl1 being inside guest). Fs hierarcy might look as follows.ext4-->ovl0-->virtiofsd0-->ovl1
This case does not work by default even if virtiofsd has
CAP_SYS_ADMINby default as overlay does not allow nesting. So when ovl1 tries to set trusted.overlay, ovl0 will deny it.
Quoted 6 lines
We could simple pass extra directory from host which does not go through overlay on host and use that as upper inside guest.
ext4-->ovl0-->virtiofsd0-->ovl1
ext4-->ovl0/upper-->virtiofsd0-->ovl1
(/upper used as upper directory of ovl1)
If I understand correctly that does mean that the L1 has to understand it's an L1 and do things differently.
Quoted 3 lines
I guess remapping "trusted.overlay" will allow us not to have a separate ovl0/upper. And following itself will work. Have you tested it? Does this work.
Not tried, but that is my hope.
Quoted 4 lines
Basically we are creating nested overlay configuration with
virtiofs in between. Is "trusted.overlay" only conflict. I wonder there might be others. Just that "trusted.overlay" is first failure we noticed.
I think there's a whole bunch of trusted.overlay.* stuff but I didn't find anything else (I think jt's a define as the prefix). Note also, that if someone has an existing fuse-overlayfs setup that nested by using user.fuseoverlayfs you might be able to use the rule system to map it back.
Quoted 10 lines
Nested Overlay
--------------
- For now I will assume that we are using separate upper dir.ext4-->ovl0-->virtiofsd0-->ovl1-->virtiofsd1-->ovl2 ext4-->ovl0/upper1-->virtiofsd0-->ovl1(uses upper1 as upperdir) ext4-->ovl0/upper2-->virtiofsd0-->ovl1-->virtiofsd1-->ovl2 (users upper2 as upper dir)
Quoted 8 lines
Basically create two directories upper1 and upper2 on regular filesystem say ext4/xfs. Bind mount them on ovl0/upper1 and ovl0/upper2 respectively. And now ovl1 uses ovl0/upper1 as upperdir and ovl2 uses ovl0/upper2 as upperdir. This should make sure ovl0, ovl1 and ovl2 are not nested from sharing upper perspective.
Now virtiofsd1 will run with '-o remap_xattr="trusted.overlay"' and virtiofsd0 will run with '-o remap_xattr="user.virtiofs.trusted.overlay"'
You could tell both layers the same thing; prefix/strip everything with
user.virtiofs. and then you can do the same thing at both layers and
they don't need to know which layer they're at.
Dave
Quoted 243 lines
Just trying to wrap my head around how our use cases will use this new remapping xattr thing.
Thanks
VivekQuoted 235 lines
docs/tools/virtiofsd.rst +34
-0+ +**scope** is: + +- 'client' - match 'key' against a xattr name from the client for + setxattr/getxattr/removexattr +- 'server' - match 'prepend' against a xattr name from the server + for listxattr +- 'all' - can be used to match both cases. + +**type** is one of: + +- 'prefix' - If 'key' matches the client then the 'prepend' + is added before the name is passed to the server. + For a server case, the prepend is tested and stripped + if matching. + +- 'ok' - The attribute name is OK and passed through to + the server unchanged. + +- 'bad' - If a client tries to use this name it's + denied using EPERM; when the server passes an attribute + name matching it's hidden. + +**key** is a string tested as a prefix on an attribute name originating +on the client. It maybe empty in which case a 'client' rule +will always match on client names. + +**prepend** is a string tested as a prefix on an attribute name originiating +on the server, and used as a new prefix. It maybe empty +in which case a 'server' rule will always match on all names from +the server. + + Examples --------@@ -123,3 +177,4 @@ Export ``/var/lib/fs/vm001/`` on vhost-user UNIX domain socket -numa node,memdev=mem \ guest# mount -t virtiofs myfs /mnt +tools/virtiofsd/passthrough_ll.c +148
-0@@ -64,6 +64,7 @@#include <syslog.h> #include <unistd.h> +#include "qemu/cutils.h" #include "passthrough_helpers.h" #include "passthrough_seccomp.h" @@ -144,6 +145,7 @@ struct lo_data {int flock;int posix_lock;int xattr; +char *xattrmap;char *source;char *modcaps;double timeout;@@ -171,6 +173,7 @@ static const struct fuse_opt lo_opts[] = { { "no_posix_lock", offsetof(struct lo_data, posix_lock), 0 }, { "xattr", offsetof(struct lo_data, xattr), 1 }, { "no_xattr", offsetof(struct lo_data, xattr), 0 }, + { "xattrmap=%s", offsetof(struct lo_data, xattrmap), 0 }, { "modcaps=%s", offsetof(struct lo_data, modcaps), 0 }, { "timeout=%lf", offsetof(struct lo_data, timeout), 0 }, { "timeout=", offsetof(struct lo_data, timeout_set), 1 },@@ -2003,6 +2006,146 @@ static void lo_flock(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi,fuse_reply_err (req, res ==-1 ? errno :0 ); } +typedef struct xattr_map_entry { +const char *key; +const char *prepend; +unsigned int flags; +}XattrMapEntry ; + +/* +* Exit; process attribute unmodified if matched. +* An empty key applies to all. +*/ +#define XATTR_MAP_FLAG_END_OK (1 << 0) +/* +* The attribute is unwanted; +* EPERM on write hidden on read. +*/ +#define XATTR_MAP_FLAG_END_BAD (1 << 1) +/* +* For attr that start with 'key' prepend 'prepend' +* 'key' maybe empty to prepend for all attrs +* key is defined from set/remove point of view. +* Automatically reversed on read +*/ +#define XATTR_MAP_FLAG_PREFIX (1 << 2) +/* Apply rule to get/set/remove */ +#define XATTR_MAP_FLAG_CLIENT (1 << 16) +/* Apply rule to list */ +#define XATTR_MAP_FLAG_SERVER (1 << 17) +/* Apply rule to all */ +#define XATTR_MAP_FLAG_ALL (XATTR_MAP_FLAG_SERVER | XATTR_MAP_FLAG_CLIENT) + +static XattrMapEntry *xattr_map_list; + +static XattrMapEntry *parse_xattrmap (const char *map) +{ +XattrMapEntry *res =NULL ; +size_t nentries =0 ; +const char *tmp; + +while (*map) { +char sep; + +if (isspace (*map)) { + map++; +continue ; + } +/* The separator is the first non-space of the rule */ + sep = *map++; +if (!sep) { +break ; + } + +/* Allocate some space for the rule */ + res =g_realloc_n (res, ++nentries,sizeof (XattrMapEntry)); + res[nentries -1 ].flags =0 ; + +if (strstart (map,"client" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_CLIENT ; + }else if (strstart (map,"server" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_SERVER ; + }else if (strstart (map,"all" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_ALL ; + }else { +fuse_log (FUSE_LOG_ERR , +"%s: Unexpected scope;" +" Expecting 'client', 'server', or 'all', in rule %zu\n" , + __func__, nentries); +exit (1 ); + } + + +if (*map != sep) { +fuse_log (FUSE_LOG_ERR , +"%s: Expecting '%c' found '%c'" +" after scope in rule %zu\n" , + __func__, sep, *map, nentries +1 ); +exit (1 ); + } +/* Skip the separator, now at the start of the 'type' */ + map++; + +/* Start of 'type' */ +if (strstart (map,"prefix" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_PREFIX ; + }else if (strstart (map,"ok" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_END_OK ; + }else if (strstart (map,"bad" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_END_BAD ; + }else { +fuse_log (FUSE_LOG_ERR , +"%s: Unexpected type;" +"Expecting 'prefix', 'ok', or 'bad' in rule %zu\n" , + __func__, nentries); +exit (1 ); + } + +if (*map++ != sep) { +fuse_log (FUSE_LOG_ERR , +"%s: Missing '%c' at end of type field of rule %zu\n" , + __func__, sep, nentries); +exit (1 ); + } + +/* At start of 'key' field */ + tmp =strchr (map, sep); +if (!tmp) { +fuse_log (FUSE_LOG_ERR , +"%s: Missing '%c' at end of key field of rule %zu" , + __func__, sep, nentries); +exit (1 ); + } + res[nentries -1 ].key =g_strndup (map, tmp - map); + map = tmp +1 ; + +/* At start of 'prepend' field */ + tmp =strchr (map, sep); +if (!tmp) { +fuse_log (FUSE_LOG_ERR , +"%s: Missing '%c' at end of prepend field of rule %zu" , + __func__, sep, nentries); +exit (1 ); + } + res[nentries -1 ].prepend =g_strndup (map, tmp - map); + map = tmp +1 ; +/* End of rule - go around again for another rule */ + } + +if (!nentries) { +fuse_log (FUSE_LOG_ERR ,"Empty xattr map\n" ); +exit (1 ); + } + +/* Add a terminator to error in cases the user hasn't specified */ + res =g_realloc_n (res, ++nentries,sizeof (XattrMapEntry)); + res[nentries -1 ].flags =XATTR_MAP_FLAG_ALL |XATTR_MAP_FLAG_END_BAD ; + res[nentries -1 ].key =g_strdup ("" ); + res[nentries -1 ].prepend =g_strdup ("" ); + +return res; +} +static void lo_getxattr (fuse_req_t req,fuse_ino_t ino,const char *name,size_t size) {@@ -2909,6 +3052,11 @@ int main(int argc, char *argv[]) }else { lo.source =strdup ("/" ); } + +if (lo.xattrmap) { + xattr_map_list =parse_xattrmap (lo.xattrmap); + } +if (!lo.timeout_set) {switch (lo.cache) {case CACHE_NONE :Signature · 6 lines
2.26.2 _______________________________________________ Virtio-fs mailing list [email protected] https://www.redhat.com/mailman/listinfo/virtio-fs
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [Virtio-fs] [PATCH v2 3/6] tools/virtiofsd: xattr name mappings: Add option
Quoted 57 lines · Dr. David Alan Gilbert
Quoted 56 lines · * Vivek Goyal ([email protected]) wrote:
Quoted 42 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Add an option to define mappings of xattr names so that the client and server filesystems see different views. This can be used to have different SELinux mappings as seen by the guest, to run the virtiofsd with less privileges (e.g. in a case where it can't set trusted/system/security xattrs but you want the guest to be able to), or to isolate multiple users of the same name; e.g. trusted attributes used by stacking overlayfs.
A mapping engine is used wit 3 simple rules; the rules can be combined to allow most useful mapping scenarios. The ruleset is defined by -o xattrmap='rules...'.
This patch doesn't use the rule maps yet.
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- docs/tools/virtiofsd.rst | 55 ++++++++++++ tools/virtiofsd/passthrough_ll.c | 148 +++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+)docs/tools/virtiofsd.rst +11
-0@@ -107,6 +107,60 @@ Options performance. ``auto`` acts similar to NFS with a 1 second metadata cache timeout. ``always`` sets a long cache lifetime at the expense of coherency. +xattr-mapping +------------- + +By default the name of xattr's used by the client are passed through to the server +file system. This can be a problem where either those xattr names are used +by something on the server (e.g. selinux client/server confusion) or if the +virtiofsd is running in a container with restricted priviliges where it cannot +access some attributes. + +A mapping of xattr names can be made using -o xattrmap=mapping where the ``mapping`` +string consists of a series of rules.docs/tools/virtiofsd.rst Options · line 130
Quoted 10 lines
docs/tools/virtiofsd.rst +10
-0+ +The first matching rule terminates the mapping. + +Each rule consists of a number of fields separated with a separator that is the +first non-white space character in the rule. This separator must then be used +for the whole rule. +White space may be added before and after each rule. +Using ':' as the separator a rule is of the form: + +``:scope:type:key:prepend:``Hi David,
Quoted 7 lines
Quoted 4 lines
This seems very genric and which makes it harder to understand and harder to write rules. I am wondering do we really need this degree of flexibility. Is it worth, dropping some of the requirements and simplify the syntax.
I'm wondering perhaps if we could solve this by adding sugared simple versions but leaving the flexible syntax for those who need it.
I guess fair enough. This syntax is so generic (hence complex), that its not my first choice. But if others feel the need of such a generic mechanism, I am not going to get in the way.
Quoted 12 lines
Quoted 2 lines
- I am wonderig why do we need to allow choice of separator.
I didnd't have that at first, but it was simple to add and solves the problem of if you have the separator in the string you want to substitute.
Quoted 4 lines
- Wondering why do we need to allow separate rules for client/server. Once we start remapping something, is it not good enough that mapping be bidirectonal.
Quoted 19 lines
Quoted 2 lines
- Not sure why separate notion of "bad". To me once we decide to remap something, should automatically block unprefixed version.
I wanted to be able to block things rather than remap; for example just to block 'trusted.'
Quoted 12 lines
IOW, what functionality we will lose if we just say
-o remap_xattr="trusted.".
This implies following.
A. If client is sending any xattr prefixed with "trusted.", prefix it with "user.virtiofs".
B. Server filters out anything starting with "trusted."
C. If server sees "user.virtiofs.trusted." it strips "user.virtiofs".
[ I had missed reading this email. Looking at it now. ]
Quoted 3 lines
Don't forget you also have to stop the client explicitly sending 'user.virtiofs.trusted'; that would let an unpriv client process overwrite the prefixed name.
Fair enough. Yes, we will have to block this as part of "remap_xattr" semantics.
Quoted 9 lines
Quoted 9 lines
For remapping security.selinux, user could specify.
-o remap_xattr="security.selinux."
For nested configuration. virtiofsd at L1 will specify.
-o remap_xattr="security.selinux.".
Quoted 7 lines
Quoted 3 lines
And virtiofsd at L0 can specify.
-o remap_xattr="user.virtiofs.security.selinux."
I think you're saying that means it needs to know if it's L0 or L1 which is a shame; ideally you'd be able to have something that transparently worked at either.
I will be nice to avoid knowing level information because it is ugly. But how to avoid it? Either don't use virtiofs in stacking configurations. But if we have to, how to avoid it?
Quoted 3 lines
In your scheme how do I do both the 'trusted.' and 'security.selinux.' stuff?
We can allow specifying multiple "remap_xattr" or allow multiple rules in single option separted by ":".
Say -o remap_xattr="security.selinux.:trusted."
Quoted 28 lines
Quoted 3 lines
I doubt we need to care about being able to remap xattrs of other filesystems like virtio-9p.
Well that's the thing; there's at least 9p and crosvm's setup; both of which are different, and it would make sense if someone wanted to transition their existing on disk container to a virtiofs setup from a 9p setup without having to change all their xattr's. That was my main reason for wanting the flexibility.
Quoted 17 lines
I also have some questions about how this will be used.
Overlay
-------
- So for non nested guests, we can have two instances of overlay. Lets call these ovl0 and ovl1. (ovl0 being on host, and ovl1 being inside guest). Fs hierarcy might look as follows.ext4-->ovl0-->virtiofsd0-->ovl1
This case does not work by default even if virtiofsd has
CAP_SYS_ADMINby default as overlay does not allow nesting. So when ovl1 tries to set trusted.overlay, ovl0 will deny it.We could simple pass extra directory from host which does not go through overlay on host and use that as upper inside guest.
Quoted 6 lines
Quoted 3 lines
ext4-->ovl0-->virtiofsd0-->ovl1
ext4-->ovl0/upper-->virtiofsd0-->ovl1
(/upper used as upper directory of ovl1)If I understand correctly that does mean that the L1 has to understand it's an L1 and do things differently.
Yes. I could not find a way to avoid it.
Quoted 34 lines
Quoted 4 lines
I guess remapping "trusted.overlay" will allow us not to have a separate ovl0/upper. And following itself will work. Have you tested it? Does this work.
Not tried, but that is my hope.
Quoted 4 lines
Basically we are creating nested overlay configuration with
virtiofs in between. Is "trusted.overlay" only conflict. I wonder there might be others. Just that "trusted.overlay" is first failure we noticed.I think there's a whole bunch of trusted.overlay.* stuff but I didn't find anything else (I think jt's a define as the prefix). Note also, that if someone has an existing fuse-overlayfs setup that nested by using user.fuseoverlayfs you might be able to use the rule system to map it back.
Quoted 16 lines
Nested Overlay
--------------
- For now I will assume that we are using separate upper dir.ext4-->ovl0-->virtiofsd0-->ovl1-->virtiofsd1-->ovl2 ext4-->ovl0/upper1-->virtiofsd0-->ovl1(uses upper1 as upperdir) ext4-->ovl0/upper2-->virtiofsd0-->ovl1-->virtiofsd1-->ovl2 (users upper2 as upper dir)
Basically create two directories upper1 and upper2 on regular filesystem say ext4/xfs. Bind mount them on ovl0/upper1 and ovl0/upper2 respectively. And now ovl1 uses ovl0/upper1 as upperdir and ovl2 uses ovl0/upper2 as upperdir. This should make sure ovl0, ovl1 and ovl2 are not nested from sharing upper perspective.
Quoted 6 lines
Quoted 2 lines
Now virtiofsd1 will run with '-o remap_xattr="trusted.overlay"' and virtiofsd0 will run with '-o remap_xattr="user.virtiofs.trusted.overlay"'
You could tell both layers the same thing; prefix/strip everything with
user.virtiofs. and then you can do the same thing at both layers and
they don't need to know which layer they're at.
Right that should work. But this will prefix user.virtiofs for every xattr. If we want to prefix it on a specific xattr, then it become little more tricky. Because inner most layer will do setxattr(trusted.foo.) and next layer will do setxattr(user.virtiofs.trusted.foo). So question is what's the common syntax which works for both.
I have been thinking little more of nested overlay use case.
If we make sure that "upper" for each overlay instance is separate (and not coming from stacked overlay), then following should work well for nested configurations.
To reiterate, I think something like this should work for nested overlay configuration.
- On host, create lower0, upper0, upper1 and upper2 dirs.
mkdir -p lower0 lower0/lower1 work0 upper1 work1 upper2 work2 ovl0
- Create ovl0 on host (L0)
mount -t overlay -o lowerdir=lower0,upperdir=upper0,workdir=work0 none ovl0
- Bind mount upper and work dirs for ovl1 and ovl2.
mkdir -p ovl0/upper1 ovl0/work1 ovl0/upper2 ovl0/work2 mount --bind upper1 ovl0/upper1 mount --bind work1 ovl0/work1 mount --bind upper2 ovl0/upper2 mount --bind work2 ovl0/work2
- Run virtiofsd0 on ovl0 with "-o remap_xattr="trusted.overlay."
- Inside L1 guest say ovl0 is mounted at "/". Create second overlay.
mkdir ovl1
mount -t overlay -o lowerdir=lower1,upperdir=upper1,workdir=work1 none ovl1
- Bind mount upper2 and work2 inside ovl1.
mkdir -p ovl1/upper2 ovl1/work2 mount --bind upper2 ovl1/upper2 mount --bind work2 ovl1/work2
- Run virtiofsd1 on ovl1 with -o "remap_xattr="trusted.overlay."
- Inisde L2 guest say virtiofs is mounted at "/"
mkdir ovl2
mount -t overlay -o lowerdir=lower1,upperdir=upper2,workdir=work2 none ovl2
Now upper for overlayfs are not stacked through overlayfs file systems.
Thanks
Vivek
Re: [PATCH v2 3/6] tools/virtiofsd: xattr name mappings: Add option
In reply to Dr. David Alan Gilbert (git)On 2020-08-27 at 17:36 CEST, Dr. David Alan Gilbert (git) wrote...
Quoted 106 lines
From: "Dr. David Alan Gilbert" <[email protected]>
Add an option to define mappings of xattr names so that the client and server filesystems see different views. This can be used to have different SELinux mappings as seen by the guest, to run the virtiofsd with less privileges (e.g. in a case where it can't set trusted/system/security xattrs but you want the guest to be able to), or to isolate multiple users of the same name; e.g. trusted attributes used by stacking overlayfs.
A mapping engine is used wit 3 simple rules; the rules can be combined to allow most useful mapping scenarios. The ruleset is defined by -o xattrmap='rules...'.
This patch doesn't use the rule maps yet.
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- docs/tools/virtiofsd.rst | 55 ++++++++++++ tools/virtiofsd/passthrough_ll.c | 148 +++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+)docs/tools/virtiofsd.rst +55
-0@@ -107,6 +107,60 @@ Options performance. ``auto`` acts similar to NFS with a 1 second metadata cache timeout. ``always`` sets a long cache lifetime at the expense of coherency. +xattr-mapping +------------- + +By default the name of xattr's used by the client are passed through to the server +file system. This can be a problem where either those xattr names are used +by something on the server (e.g. selinux client/server confusion) or if the +virtiofsd is running in a container with restricted priviliges where it cannot +access some attributes. + +A mapping of xattr names can be made using -o xattrmap=mapping where the ``mapping`` +string consists of a series of rules. + +The first matching rule terminates the mapping. + +Each rule consists of a number of fields separated with a separator that is the +first non-white space character in the rule. This separator must then be used +for the whole rule. +White space may be added before and after each rule. +Using ':' as the separator a rule is of the form: + +``:scope:type:key:prepend:`` + +**scope** is: + +- 'client' - match 'key' against a xattr name from the client for + setxattr/getxattr/removexattr +- 'server' - match 'prepend' against a xattr name from the server + for listxattr +- 'all' - can be used to match both cases. + +**type** is one of: + +- 'prefix' - If 'key' matches the client then the 'prepend' + is added before the name is passed to the server. + For a server case, the prepend is tested and stripped + if matching. + +- 'ok' - The attribute name is OK and passed through to + the server unchanged. + +- 'bad' - If a client tries to use this name it's + denied using EPERM; when the server passes an attribute + name matching it's hidden. + +**key** is a string tested as a prefix on an attribute name originating +on the client. It maybe empty in which case a 'client' rule +will always match on client names. + +**prepend** is a string tested as a prefix on an attribute name originiating +on the server, and used as a new prefix. It maybe empty +in which case a 'server' rule will always match on all names from +the server. + + Examples --------@@ -123,3 +177,4 @@ Export ``/var/lib/fs/vm001/`` on vhost-user UNIX domain socket -numa node,memdev=mem \ guest# mount -t virtiofs myfs /mnt +tools/virtiofsd/passthrough_ll.c +1
-0@@ -64,6 +64,7 @@#include <syslog.h> #include <unistd.h> +#include "qemu/cutils.h" #include "passthrough_helpers.h" #include "passthrough_seccomp.h"
tools/virtiofsd/passthrough_ll.c struct lo_data { · line 148
Quoted 4 lines
tools/virtiofsd/passthrough_ll.c +1
-0@@ -144,6 +145,7 @@ struct lo_data {int flock;int posix_lock;int xattr; +char *xattrmap;
Who owns that field? Should it be cleaned up in fuse_lo_data_cleanup() just like source is?
Quoted 36 lines
tools/virtiofsd/passthrough_ll.c +22
-0char *source;char *modcaps;double timeout;@@ -171,6 +173,7 @@ static const struct fuse_opt lo_opts[] = { { "no_posix_lock", offsetof(struct lo_data, posix_lock), 0 }, { "xattr", offsetof(struct lo_data, xattr), 1 }, { "no_xattr", offsetof(struct lo_data, xattr), 0 }, + { "xattrmap=%s", offsetof(struct lo_data, xattrmap), 0 }, { "modcaps=%s", offsetof(struct lo_data, modcaps), 0 }, { "timeout=%lf", offsetof(struct lo_data, timeout), 0 }, { "timeout=", offsetof(struct lo_data, timeout_set), 1 },@@ -2003,6 +2006,146 @@ static void lo_flock(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi,fuse_reply_err (req, res ==-1 ? errno :0 ); } +typedef struct xattr_map_entry { +const char *key; +const char *prepend; +unsigned int flags; +}XattrMapEntry ; + +/* +* Exit; process attribute unmodified if matched. +* An empty key applies to all. +*/ +#define XATTR_MAP_FLAG_END_OK (1 << 0) +/* +* The attribute is unwanted; +* EPERM on write hidden on read. +*/ +#define XATTR_MAP_FLAG_END_BAD (1 << 1) +/* +* For attr that start with 'key' prepend 'prepend' +* 'key' maybe empty to prepend for all attrs +* key is defined from set/remove point of view. +* Automatically reversed on read
tools/virtiofsd/passthrough_ll.c static void lo_flock(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi, · line 2039
Quoted 10 lines
tools/virtiofsd/passthrough_ll.c +10
-0+*/ +#define XATTR_MAP_FLAG_PREFIX (1 << 2) +/* Apply rule to get/set/remove */ +#define XATTR_MAP_FLAG_CLIENT (1 << 16) +/* Apply rule to list */ +#define XATTR_MAP_FLAG_SERVER (1 << 17) +/* Apply rule to all */ +#define XATTR_MAP_FLAG_ALL (XATTR_MAP_FLAG_SERVER | XATTR_MAP_FLAG_CLIENT) + +static XattrMapEntry *xattr_map_list;
Curious why you made it a static variable and not a field in struct lo_data?
Quoted 13 lines
tools/virtiofsd/passthrough_ll.c +13
-0+ +static XattrMapEntry *parse_xattrmap (const char *map) +{ +XattrMapEntry *res =NULL ; +size_t nentries =0 ; +const char *tmp; + +while (*map) { +char sep; + +if (isspace (*map)) { + map++; +continue ;
tools/virtiofsd/passthrough_ll.c static void lo_flock(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi, · line 2062
Quoted 10 lines
tools/virtiofsd/passthrough_ll.c +10
-0+ } +/* The separator is the first non-space of the rule */ + sep = *map++; +if (!sep) { +break ; + } + +/* Allocate some space for the rule */ + res =g_realloc_n (res, ++nentries,sizeof (XattrMapEntry)); + res[nentries -1 ].flags =0 ;
I would probably create an entry pointer to res[nentries - 1] since there are 9 uses for it.
Quoted 11 lines
tools/virtiofsd/passthrough_ll.c +11
-0+ +if (strstart (map,"client" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_CLIENT ; + }else if (strstart (map,"server" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_SERVER ; + }else if (strstart (map,"all" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_ALL ; + }else { + fuse_log(FUSE_LOG_ERR, + "%s: Unexpected scope;" + " Expecting 'client', 'server', or 'all', in rule %zu\n",
tools/virtiofsd/passthrough_ll.c static void lo_flock(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi, · line 2083
Quoted 10 lines
tools/virtiofsd/passthrough_ll.c +10
-0+ __func__, nentries); +exit (1 ); + } + + +if (*map != sep) { +fuse_log (FUSE_LOG_ERR , +"%s: Expecting '%c' found '%c'" +" after scope in rule %zu\n" , + __func__, sep, *map, nentries +1 );
I think it should be nentries here like in the others
Quoted 69 lines
tools/virtiofsd/passthrough_ll.c +65
-0+exit (1 ); + } +/* Skip the separator, now at the start of the 'type' */ + map++; + +/* Start of 'type' */ +if (strstart (map,"prefix" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_PREFIX ; + }else if (strstart (map,"ok" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_END_OK ; + }else if (strstart (map,"bad" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_END_BAD ; + }else { +fuse_log (FUSE_LOG_ERR , +"%s: Unexpected type;" +"Expecting 'prefix', 'ok', or 'bad' in rule %zu\n" , + __func__, nentries); +exit (1 ); + } + +if (*map++ != sep) { +fuse_log (FUSE_LOG_ERR , +"%s: Missing '%c' at end of type field of rule %zu\n" , + __func__, sep, nentries); +exit (1 ); + } + +/* At start of 'key' field */ + tmp =strchr (map, sep); +if (!tmp) { +fuse_log (FUSE_LOG_ERR , +"%s: Missing '%c' at end of key field of rule %zu" , + __func__, sep, nentries); +exit (1 ); + } + res[nentries -1 ].key =g_strndup (map, tmp - map); + map = tmp +1 ; + +/* At start of 'prepend' field */ + tmp =strchr (map, sep); +if (!tmp) { +fuse_log (FUSE_LOG_ERR , +"%s: Missing '%c' at end of prepend field of rule %zu" , + __func__, sep, nentries); +exit (1 ); + } + res[nentries -1 ].prepend =g_strndup (map, tmp - map); + map = tmp +1 ; +/* End of rule - go around again for another rule */ + } + +if (!nentries) { +fuse_log (FUSE_LOG_ERR ,"Empty xattr map\n" ); +exit (1 ); + } + +/* Add a terminator to error in cases the user hasn't specified */ + res =g_realloc_n (res, ++nentries,sizeof (XattrMapEntry)); + res[nentries -1 ].flags =XATTR_MAP_FLAG_ALL |XATTR_MAP_FLAG_END_BAD ; + res[nentries -1 ].key =g_strdup ("" ); + res[nentries -1 ].prepend =g_strdup ("" ); + +return res; +} +static void lo_getxattr (fuse_req_t req,fuse_ino_t ino,const char *name,size_t size) {
tools/virtiofsd/passthrough_ll.c int main(int argc, char *argv[]) · line 3057
Quoted 6 lines
tools/virtiofsd/passthrough_ll.c +3
-0@@ -2909,6 +3052,11 @@ int main(int argc, char *argv[]) }else { lo.source =strdup ("/" ); } + +if (lo.xattrmap) { + xattr_map_list =parse_xattrmap (lo.xattrmap);
This is never freed. If you put the static in struct lo_data, you could naturally clean it up in fuse_lo_data_cleanup.
tools/virtiofsd/passthrough_ll.c int main(int argc, char *argv[]) · line 3062
Quoted 5 lines
tools/virtiofsd/passthrough_ll.c +2
-0+ } +if (!lo.timeout_set) {switch (lo.cache) {case CACHE_NONE :
--
Cheers,
Christophe de Dinechin (IRC c3d)
Re: [PATCH v2 3/6] tools/virtiofsd: xattr name mappings: Add option
Quoted 107 lines · * Christophe de Dinechin ([email protected]) wrote:
On 2020-08-27 at 17:36 CEST, Dr. David Alan Gilbert (git) wrote...
Quoted 105 lines
From: "Dr. David Alan Gilbert" <[email protected]>
Add an option to define mappings of xattr names so that the client and server filesystems see different views. This can be used to have different SELinux mappings as seen by the guest, to run the virtiofsd with less privileges (e.g. in a case where it can't set trusted/system/security xattrs but you want the guest to be able to), or to isolate multiple users of the same name; e.g. trusted attributes used by stacking overlayfs.
A mapping engine is used wit 3 simple rules; the rules can be combined to allow most useful mapping scenarios. The ruleset is defined by -o xattrmap='rules...'.
This patch doesn't use the rule maps yet.
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- docs/tools/virtiofsd.rst | 55 ++++++++++++ tools/virtiofsd/passthrough_ll.c | 148 +++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+)docs/tools/virtiofsd.rst +55
-0@@ -107,6 +107,60 @@ Options performance. ``auto`` acts similar to NFS with a 1 second metadata cache timeout. ``always`` sets a long cache lifetime at the expense of coherency. +xattr-mapping +------------- + +By default the name of xattr's used by the client are passed through to the server +file system. This can be a problem where either those xattr names are used +by something on the server (e.g. selinux client/server confusion) or if the +virtiofsd is running in a container with restricted priviliges where it cannot +access some attributes. + +A mapping of xattr names can be made using -o xattrmap=mapping where the ``mapping`` +string consists of a series of rules. + +The first matching rule terminates the mapping. + +Each rule consists of a number of fields separated with a separator that is the +first non-white space character in the rule. This separator must then be used +for the whole rule. +White space may be added before and after each rule. +Using ':' as the separator a rule is of the form: + +``:scope:type:key:prepend:`` + +**scope** is: + +- 'client' - match 'key' against a xattr name from the client for + setxattr/getxattr/removexattr +- 'server' - match 'prepend' against a xattr name from the server + for listxattr +- 'all' - can be used to match both cases. + +**type** is one of: + +- 'prefix' - If 'key' matches the client then the 'prepend' + is added before the name is passed to the server. + For a server case, the prepend is tested and stripped + if matching. + +- 'ok' - The attribute name is OK and passed through to + the server unchanged. + +- 'bad' - If a client tries to use this name it's + denied using EPERM; when the server passes an attribute + name matching it's hidden. + +**key** is a string tested as a prefix on an attribute name originating +on the client. It maybe empty in which case a 'client' rule +will always match on client names. + +**prepend** is a string tested as a prefix on an attribute name originiating +on the server, and used as a new prefix. It maybe empty +in which case a 'server' rule will always match on all names from +the server. + + Examples --------@@ -123,3 +177,4 @@ Export ``/var/lib/fs/vm001/`` on vhost-user UNIX domain socket -numa node,memdev=mem \ guest# mount -t virtiofs myfs /mnt +tools/virtiofsd/passthrough_ll.c +1
-0@@ -64,6 +64,7 @@#include <syslog.h> #include <unistd.h> +#include "qemu/cutils.h" #include "passthrough_helpers.h" #include "passthrough_seccomp.h"
Quoted 8 lines
tools/virtiofsd/passthrough_ll.c struct lo_data { · line 148
Quoted 5 lines
tools/virtiofsd/passthrough_ll.c +1
-0@@ -144,6 +145,7 @@ struct lo_data {int flock;int posix_lock;int xattr; +char *xattrmap;Who owns that field? Should it be cleaned up in
fuse_lo_data_cleanup()just like source is?
Done.
Quoted 40 lines
Quoted 40 lines
tools/virtiofsd/passthrough_ll.c +26
-0char *source;char *modcaps;double timeout;@@ -171,6 +173,7 @@ static const struct fuse_opt lo_opts[] = { { "no_posix_lock", offsetof(struct lo_data, posix_lock), 0 }, { "xattr", offsetof(struct lo_data, xattr), 1 }, { "no_xattr", offsetof(struct lo_data, xattr), 0 }, + { "xattrmap=%s", offsetof(struct lo_data, xattrmap), 0 }, { "modcaps=%s", offsetof(struct lo_data, modcaps), 0 }, { "timeout=%lf", offsetof(struct lo_data, timeout), 0 }, { "timeout=", offsetof(struct lo_data, timeout_set), 1 },@@ -2003,6 +2006,146 @@ static void lo_flock(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi,fuse_reply_err (req, res ==-1 ? errno :0 ); } +typedef struct xattr_map_entry { +const char *key; +const char *prepend; +unsigned int flags; +}XattrMapEntry ; + +/* +* Exit; process attribute unmodified if matched. +* An empty key applies to all. +*/ +#define XATTR_MAP_FLAG_END_OK (1 << 0) +/* +* The attribute is unwanted; +* EPERM on write hidden on read. +*/ +#define XATTR_MAP_FLAG_END_BAD (1 << 1) +/* +* For attr that start with 'key' prepend 'prepend' +* 'key' maybe empty to prepend for all attrs +* key is defined from set/remove point of view. +* Automatically reversed on read +*/ +#define XATTR_MAP_FLAG_PREFIX (1 << 2) +/* Apply rule to get/set/remove */ +#define XATTR_MAP_FLAG_CLIENT (1 << 16)
Quoted 8 lines
tools/virtiofsd/passthrough_ll.c static void lo_flock(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi, · line 2039
Quoted 6 lines
tools/virtiofsd/passthrough_ll.c +6
-0+/* Apply rule to list */ +#define XATTR_MAP_FLAG_SERVER (1 << 17) +/* Apply rule to all */ +#define XATTR_MAP_FLAG_ALL (XATTR_MAP_FLAG_SERVER | XATTR_MAP_FLAG_CLIENT) + +static XattrMapEntry *xattr_map_list;Curious why you made it a static variable and not a field in struct
lo_data?
Done.
Quoted 18 lines
Quoted 18 lines
tools/virtiofsd/passthrough_ll.c +18
-0+ +static XattrMapEntry *parse_xattrmap (const char *map) +{ +XattrMapEntry *res =NULL ; +size_t nentries =0 ; +const char *tmp; + +while (*map) { +char sep; + +if (isspace (*map)) { + map++; +continue ; + } +/* The separator is the first non-space of the rule */ + sep = *map++; +if (!sep) { +break ;
Quoted 8 lines
tools/virtiofsd/passthrough_ll.c static void lo_flock(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi, · line 2062
Quoted 5 lines
tools/virtiofsd/passthrough_ll.c +5
-0+ } + +/* Allocate some space for the rule */ + res =g_realloc_n (res, ++nentries,sizeof (XattrMapEntry)); + res[nentries -1 ].flags =0 ;I would probably create an
entrypointer tores[nentries - 1]since there are 9 uses for it.
I've reworked that whole bit; we've now got a temporary and a function that adds an entry.
Quoted 15 lines
Quoted 15 lines
tools/virtiofsd/passthrough_ll.c +15
-0+ +if (strstart (map,"client" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_CLIENT ; + }else if (strstart (map,"server" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_SERVER ; + }else if (strstart (map,"all" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_ALL ; + }else { +fuse_log (FUSE_LOG_ERR , +"%s: Unexpected scope;" +" Expecting 'client', 'server', or 'all', in rule %zu\n" , + __func__, nentries); +exit (1 ); + } +
Quoted 8 lines
tools/virtiofsd/passthrough_ll.c static void lo_flock(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi, · line 2083
Quoted 6 lines
tools/virtiofsd/passthrough_ll.c +6
-0+ +if (*map != sep) { +fuse_log (FUSE_LOG_ERR , +"%s: Expecting '%c' found '%c'" +" after scope in rule %zu\n" , + __func__, sep, *map, nentries +1 );I think it should be
nentrieshere like in the others
Done.
Quoted 70 lines
Quoted 70 lines
tools/virtiofsd/passthrough_ll.c +65
-0+exit (1 ); + } +/* Skip the separator, now at the start of the 'type' */ + map++; + +/* Start of 'type' */ +if (strstart (map,"prefix" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_PREFIX ; + }else if (strstart (map,"ok" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_END_OK ; + }else if (strstart (map,"bad" , &map)) { + res[nentries -1 ].flags |=XATTR_MAP_FLAG_END_BAD ; + }else { +fuse_log (FUSE_LOG_ERR , +"%s: Unexpected type;" +"Expecting 'prefix', 'ok', or 'bad' in rule %zu\n" , + __func__, nentries); +exit (1 ); + } + +if (*map++ != sep) { +fuse_log (FUSE_LOG_ERR , +"%s: Missing '%c' at end of type field of rule %zu\n" , + __func__, sep, nentries); +exit (1 ); + } + +/* At start of 'key' field */ + tmp =strchr (map, sep); +if (!tmp) { +fuse_log (FUSE_LOG_ERR , +"%s: Missing '%c' at end of key field of rule %zu" , + __func__, sep, nentries); +exit (1 ); + } + res[nentries -1 ].key =g_strndup (map, tmp - map); + map = tmp +1 ; + +/* At start of 'prepend' field */ + tmp =strchr (map, sep); +if (!tmp) { +fuse_log (FUSE_LOG_ERR , +"%s: Missing '%c' at end of prepend field of rule %zu" , + __func__, sep, nentries); +exit (1 ); + } + res[nentries -1 ].prepend =g_strndup (map, tmp - map); + map = tmp +1 ; +/* End of rule - go around again for another rule */ + } + +if (!nentries) { +fuse_log (FUSE_LOG_ERR ,"Empty xattr map\n" ); +exit (1 ); + } + +/* Add a terminator to error in cases the user hasn't specified */ + res =g_realloc_n (res, ++nentries,sizeof (XattrMapEntry)); + res[nentries -1 ].flags =XATTR_MAP_FLAG_ALL |XATTR_MAP_FLAG_END_BAD ; + res[nentries -1 ].key =g_strdup ("" ); + res[nentries -1 ].prepend =g_strdup ("" ); + +return res; +} +static void lo_getxattr (fuse_req_t req,fuse_ino_t ino,const char *name,size_t size) {@@ -2909,6 +3052,11 @@ int main(int argc, char *argv[]) }else {
Quoted 8 lines
tools/virtiofsd/passthrough_ll.c int main(int argc, char *argv[]) · line 3057
Quoted 5 lines
tools/virtiofsd/passthrough_ll.c +3
-0lo.source =strdup ("/" ); } + +if (lo.xattrmap) { + xattr_map_list =parse_xattrmap (lo.xattrmap);This is never freed. If you put the static in struct
lo_data, you could naturally clean it up infuse_lo_data_cleanup.
Cleanup added.
Dave
Quoted 10 lines
tools/virtiofsd/passthrough_ll.c int main(int argc, char *argv[]) · line 3062
Quoted 5 lines
tools/virtiofsd/passthrough_ll.c +2
-0+ } +if (!lo.timeout_set) {switch (lo.cache) {case CACHE_NONE :--
Cheers,
Christophe de Dinechin (IRC c3d)
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
PATCH v2 4/6 tools/virtiofsd: xattr name mappings: Map client xattr names
In reply to Dr. David Alan Gilbert (git)From: "Dr. David Alan Gilbert" <[email protected]>
Map xattr names originating at the client; from get/set/remove xattr.
--- tools/virtiofsd/passthrough_ll.c | 102 ++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 3 deletions(-)
tools/virtiofsd/passthrough_ll.c +99 -3
@@ -2146,20 +2146,81 @@ static XattrMapEntry *parse_xattrmap(const char *map)return res; } -static void lo_getxattr (fuse_req_t req,fuse_ino_t ino,const char *name, +/* +* For use with getxattr/setxattr/removexattr, where the client +* gives us a name and we may need to choose a different one. +* Allocates a buffer for the result placing it in *out_name. +* If there's no change then *out_name is not set. +* Returns 0 on success +* Can return -EPERM to indicate we block a given attribute +* (in which case out_name is not allocated) +* Can return -ENOMEM to indicate out_name couldn't be allocated. +*/ +static int xattr_map_client (const char *client_name,char **out_name) +{ +const XattrMapEntry *cur_entry; + +for (cur_entry = xattr_map_list; ; cur_entry++) { +if ((cur_entry->flags &XATTR_MAP_FLAG_CLIENT ) && + (!strncmp (cur_entry->key, + client_name, +strlen (cur_entry->key)))) { +if (cur_entry->flags &XATTR_MAP_FLAG_END_BAD ) { +return -EPERM ; + } +if (cur_entry->flags &XATTR_MAP_FLAG_END_OK ) { +/* Unmodified name */ +return 0 ; + } +if (cur_entry->flags &XATTR_MAP_FLAG_PREFIX ) { + *out_name =g_try_malloc (strlen (client_name) + +strlen (cur_entry->prepend) +1 ); +if (!*out_name) { +return -ENOMEM ; + } +sprintf (*out_name,"%s%s" , cur_entry->prepend, client_name); +return 0 ; + } + } + } + +/* Shouldn't get here - rules should have an END_* */ +abort (); +} + +static void lo_getxattr (fuse_req_t req,fuse_ino_t ino,const char *in_name,size_t size) {struct lo_data *lo =lo_data (req);char *value =NULL ;char procname[64 ]; +const char *name; +char *mapped_name;struct lo_inode *inode;ssize_t ret;int saverr;int fd =-1 ; + mapped_name =NULL ; + name = in_name; +if (lo->xattrmap) { + ret =xattr_map_client (in_name, &mapped_name); +if (ret <0 ) { +if (ret == -EPERM ) { + ret = -ENODATA ; + } +fuse_reply_err (req, -ret); +return ; + } +if (mapped_name) { + name = mapped_name; + } + } + inode =lo_inode (req, ino);if (!inode) {fuse_reply_err (req,EBADF ); +g_free (mapped_name);return ; }
@@ -2224,6 +2285,7 @@ out_err: saverr = errno; out:fuse_reply_err (req, saverr); +g_free (mapped_name); goto out_free; }
@@ -2301,19 +2363,35 @@ out: goto out_free; } -static void lo_setxattr (fuse_req_t req,fuse_ino_t ino,const char *name, +static void lo_setxattr (fuse_req_t req,fuse_ino_t ino,const char *in_name,const char *value,size_t size,int flags) {char procname[64 ]; +const char *name; +char *mapped_name;struct lo_data *lo =lo_data (req);struct lo_inode *inode;ssize_t ret;int saverr;int fd =-1 ; + mapped_name =NULL ; + name = in_name; +if (lo->xattrmap) { + ret =xattr_map_client (in_name, &mapped_name); +if (ret <0 ) { +fuse_reply_err (req, -ret); +return ; + } +if (mapped_name) { + name = mapped_name; + } + } + inode =lo_inode (req, ino);if (!inode) {fuse_reply_err (req,EBADF ); +g_free (mapped_name);return ; }
@@ -2348,21 +2426,38 @@ out: }lo_inode_put (lo, &inode); +g_free (mapped_name);fuse_reply_err (req, saverr); } -static void lo_removexattr (fuse_req_t req,fuse_ino_t ino,const char *name) +static void lo_removexattr (fuse_req_t req,fuse_ino_t ino,const char *in_name) {char procname[64 ]; +const char *name; +char *mapped_name;struct lo_data *lo =lo_data (req);struct lo_inode *inode;ssize_t ret;int saverr;int fd =-1 ; + mapped_name =NULL ; + name = in_name; +if (lo->xattrmap) { + ret =xattr_map_client (in_name, &mapped_name); +if (ret <0 ) { +fuse_reply_err (req, -ret); +return ; + } +if (mapped_name) { + name = mapped_name; + } + } + inode =lo_inode (req, ino);if (!inode) {fuse_reply_err (req,EBADF ); +g_free (mapped_name);return ; }
@@ -2397,6 +2492,7 @@ out: }lo_inode_put (lo, &inode); +g_free (mapped_name);fuse_reply_err (req, saverr); }
Signature · 1 line
2.26.2
PATCH v2 5/6 tools/virtiofsd: xattr name mappings: Map server xattr names
In reply to Dr. David Alan Gilbert (git)From: "Dr. David Alan Gilbert" <[email protected]>
Map xattr names coming from the server, i.e. the host filesystem; currently this is only from listxattr.
--- tools/virtiofsd/passthrough_ll.c | 88 ++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+)
tools/virtiofsd/passthrough_ll.c +88 -0
@@ -2188,6 +2188,42 @@ static int xattr_map_client(const char *client_name, char **out_name)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 char *server_name,const char **out_name) +{ +const XattrMapEntry *cur_entry; +for (cur_entry = xattr_map_list; ; cur_entry++) { +if ((cur_entry->flags &XATTR_MAP_FLAG_SERVER ) && + (!strncmp (cur_entry->prepend, + server_name, +strlen (cur_entry->prepend)))) { +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 = server_name +strlen (cur_entry->prepend); +return 0 ; + } + } + } + +/* Shouldn't get here - rules should have an END_* */ +abort (); +} +static void lo_getxattr (fuse_req_t req,fuse_ino_t ino,const char *in_name,size_t size) {
@@ -2342,8 +2378,60 @@ static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size)if (ret ==0 ) { goto out; } + +if (lo->xattrmap) { +/* +* 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 (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); } out_free:
Signature · 1 line
2.26.2
Re: [PATCH v2 5/6] tools/virtiofsd: xattr name mappings: Map server xattr names
On 2020-08-27 at 17:36 CEST, Dr. David Alan Gilbert (git) wrote...
Quoted 26 lines
From: "Dr. David Alan Gilbert" <[email protected]>
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 <[email protected]>--- tools/virtiofsd/passthrough_ll.c | 88 ++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+)tools/virtiofsd/passthrough_ll.c +8
-0@@ -2188,6 +2188,42 @@ static int xattr_map_client(const char *client_name, char **out_name)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.
tools/virtiofsd/passthrough_ll.c static int xattr_map_client(const char *client_name, char **out_name) · line 2208
Quoted 10 lines
tools/virtiofsd/passthrough_ll.c +9
-0+*/ +static int xattr_map_server (const char *server_name,const char **out_name) +{ +const XattrMapEntry *cur_entry; +for (cur_entry = xattr_map_list; ; cur_entry++) { +if ((cur_entry->flags &XATTR_MAP_FLAG_SERVER ) && + (!strncmp (cur_entry->prepend, + server_name, +strlen (cur_entry->prepend)))) {
Might be slightly clearer (and possibly faster) as
strstart(cur_entry->prepend, server_name, &end)
tools/virtiofsd/passthrough_ll.c static int xattr_map_client(const char *client_name, char **out_name) · line 2217
Quoted 10 lines
tools/virtiofsd/passthrough_ll.c +10
-0+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 = server_name +strlen (cur_entry->prepend);
With the above, that would be
*out_name = end;
tools/virtiofsd/passthrough_ll.c static int xattr_map_client(const char *client_name, char **out_name) · line 2223
Quoted 6 lines
tools/virtiofsd/passthrough_ll.c +6
-0+return 0 ; + } + } + } + +/* Shouldn't get here - rules should have an END_* */
You probably want to point the finger back to parse_xattrmap() in the comment?
tools/virtiofsd/passthrough_ll.c static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size) · line 2382
Quoted 13 lines
tools/virtiofsd/passthrough_ll.c +3
-0+abort (); +} + static void lo_getxattr(fuse_req_t req, fuse_ino_t ino, const char *in_name,
size_tsize)
{tools/virtiofsd/passthrough_ll.c +2
-0@@ -2342,8 +2378,60 @@ static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size)if (ret ==0 ) { goto out; } + +if (lo->xattrmap) {
If you put the "XattrMapEntry" pointer in lo, then you would probably test that.
Quoted 42 lines
tools/virtiofsd/passthrough_ll.c +42
-0+/* +* 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 (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 ) {
tools/virtiofsd/passthrough_ll.c static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size) · line 2434
Quoted 10 lines
tools/virtiofsd/passthrough_ll.c +8
-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. +*/
I don't understand the comment above. We are in the !lo->xattrmap) case, no?
tools/virtiofsd/passthrough_ll.c static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size) · line 2437
Quoted 3 lines
tools/virtiofsd/passthrough_ll.c +0
-0fuse_reply_xattr (req, ret); } out_free:
--
Cheers,
Christophe de Dinechin (IRC c3d)
Re: [PATCH v2 5/6] tools/virtiofsd: xattr name mappings: Map server xattr names
Quoted 39 lines · * Christophe de Dinechin ([email protected]) wrote:
On 2020-08-27 at 17:36 CEST, Dr. David Alan Gilbert (git) wrote...
Quoted 26 lines
From: "Dr. David Alan Gilbert" <[email protected]>
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 <[email protected]>--- tools/virtiofsd/passthrough_ll.c | 88 ++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+)tools/virtiofsd/passthrough_ll.c +8
-0@@ -2188,6 +2188,42 @@ static int xattr_map_client(const char *client_name, char **out_name)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. tools/virtiofsd/passthrough_ll.c static int xattr_map_client(const char *client_name, char **out_name) · line 2208
Quoted 10 lines
tools/virtiofsd/passthrough_ll.c +9
-0+*/ +static int xattr_map_server (const char *server_name,const char **out_name) +{ +const XattrMapEntry *cur_entry; +for (cur_entry = xattr_map_list; ; cur_entry++) { +if ((cur_entry->flags &XATTR_MAP_FLAG_SERVER ) && + (!strncmp (cur_entry->prepend, + server_name, +strlen (cur_entry->prepend)))) {
Quoted 3 lines
Might be slightly clearer (and possibly faster) as
strstart(cur_entry->prepend, server_name, &end)
I think this is actually,
strstart(server_name, cur_entry->prepend, &end)
because I think strstart writes the offset into the 1st string into &end expecting the 2nd string to be the thing to test for. Agreed?
Quoted 11 lines
tools/virtiofsd/passthrough_ll.c static int xattr_map_client(const char *client_name, char **out_name) · line 2217
Quoted 10 lines
tools/virtiofsd/passthrough_ll.c +10
-0+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 = server_name +strlen (cur_entry->prepend);
Quoted 3 lines
With the above, that would be
*out_name = end;
OK.
Quoted 9 lines
tools/virtiofsd/passthrough_ll.c static int xattr_map_client(const char *client_name, char **out_name) · line 2223
Quoted 7 lines
tools/virtiofsd/passthrough_ll.c +6
-0+return 0 ; + } + } + } + +/* Shouldn't get here - rules should have an END_* */ You probably want to point the finger back to
parse_xattrmap()in the comment?
Done.
Quoted 15 lines
tools/virtiofsd/passthrough_ll.c static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size) · line 2382
Quoted 13 lines
tools/virtiofsd/passthrough_ll.c +3
-0+abort (); +} + static void lo_getxattr(fuse_req_t req, fuse_ino_t ino, const char *in_name,
size_tsize)
{tools/virtiofsd/passthrough_ll.c +2
-0@@ -2342,8 +2378,60 @@ static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size)if (ret ==0 ) { goto out; } + +if (lo->xattrmap) {If you put the "XattrMapEntry" pointer in lo, then you would probably test that.
Done
Quoted 47 lines
Quoted 47 lines
tools/virtiofsd/passthrough_ll.c +45
-0+/* +* 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 (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);
Quoted 8 lines
tools/virtiofsd/passthrough_ll.c static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size) · line 2434
Quoted 6 lines
tools/virtiofsd/passthrough_ll.c +5
-0}else { +/* +* xattrmap only ever shortens the result, +* so we don't need to do anything clever with the +* allocation length here. +*/ I don't understand the comment above. We are in the !lo->xattrmap) case, no?
No, we're in the else for if (size) { for the case where the caller is trying not to actually get a list of the attributes, but to get a guess of the size of storage needed.
Dave
Quoted 8 lines
tools/virtiofsd/passthrough_ll.c static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size) · line 2437
Quoted 3 lines
tools/virtiofsd/passthrough_ll.c +0
-0fuse_reply_xattr (req, ret); } out_free:--
Cheers,
Christophe de Dinechin (IRC c3d)
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [PATCH v2 5/6] tools/virtiofsd: xattr name mappings: Map server xattr names
In reply to Dr. David Alan Gilbert (git)On 2020-08-27 at 17:36 CEST, Dr. David Alan Gilbert (git) wrote...
Quoted 25 lines
From: "Dr. David Alan Gilbert" <[email protected]>
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 <[email protected]>--- tools/virtiofsd/passthrough_ll.c | 88 ++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+)tools/virtiofsd/passthrough_ll.c +7
-0@@ -2188,6 +2188,42 @@ static int xattr_map_client(const char *client_name, char **out_name)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
tools/virtiofsd/passthrough_ll.c static int xattr_map_client(const char *client_name, char **out_name) · line 2207
Quoted 10 lines
tools/virtiofsd/passthrough_ll.c +10
-0+* Can return -ENODATA to indicate the name should be dropped from the list. +*/ +static int xattr_map_server (const char *server_name,const char **out_name) +{ +const XattrMapEntry *cur_entry; +for (cur_entry = xattr_map_list; ; cur_entry++) { +if ((cur_entry->flags &XATTR_MAP_FLAG_SERVER ) && + (!strncmp (cur_entry->prepend, + server_name, +strlen (cur_entry->prepend)))) {
Overall, the same remarks apply as for the client side.
Quoted 73 lines
tools/virtiofsd/passthrough_ll.c +66
-0+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 = server_name +strlen (cur_entry->prepend); +return 0 ; + } + } + } + +/* Shouldn't get here - rules should have an END_* */ +abort (); +} +static void lo_getxattr (fuse_req_t req,fuse_ino_t ino,const char *in_name,size_t size) {@@ -2342,8 +2378,60 @@ static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size)if (ret ==0 ) { goto out; } + +if (lo->xattrmap) { +/* +* 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 (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; + } + }
tools/virtiofsd/passthrough_ll.c static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size) · line 2437
Quoted 10 lines
tools/virtiofsd/passthrough_ll.c +5
-0fuse_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); } out_free:
--
Cheers,
Christophe de Dinechin (IRC c3d)
PATCH v2 6/6 tools/virtiofsd: xattr name mapping examples
In reply to Dr. David Alan Gilbert (git)From: "Dr. David Alan Gilbert" <[email protected]>
Add a few examples of xattrmaps to the documentation.
--- docs/tools/virtiofsd.rst | 49 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+)
docs/tools/virtiofsd.rst +49 -0
@@ -161,6 +161,55 @@ in which case a 'server' rule will always match on all names from the server. +xattr-mapping Examples +---------------------- + +1) Prefix all attributes with 'user.virtiofs.' + +:: + +-o xattrmap=":all:prefix::user.virtiofs.::all:bad:::" + + +This uses two rules, using : as the field separator; +the first rule prefixes and strips 'user.virtiofs.', +the second rule hides any non-prefixed attributes that +the host set. + +2) Prefix 'trusted.' attributes, allow others through + +:: + + "/all/prefix/trusted./user.virtiofs./ + /server/bad//trusted./ + /client/bad/user.virtiofs.trusted.// + /all/ok///" + + +Here there are four rules, using / as the field +separator, and also demonstrating that new lines can +be included between rules. +The first rule is the prefixing of 'trusted.'. +The second rule hides unprefixed 'trusted.' attributes +on the host. +The third rule stops a guest from explicitily setting +the 'user.viritofs.trusted.' path directly. +Finally, the fourth rule lets all remaining attributes +through. + +3) Hide 'security.' attributes, and allow everything else + +:: + + "/all/bad/security./security./ + /all/ok///' + +The first rule combines what could be separate client and server +rules into a single 'all' rule, matching 'security.' in either +client arguments or lists returned from the host. This stops +the client seeing any 'security.' attributes on the server and +stops it setting any. + Examples --------
Signature · 1 line
2.26.2
Re: [PATCH v2 6/6] tools/virtiofsd: xattr name mapping examples
Quoted 39 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Add a few examples of xattrmaps to the documentation.
Signed-off-by Dr. David Alan Gilbert <[email protected]>---
docs/tools/virtiofsd.rst| 49 ++++++++++++++++++++++++++++++++++++++++1 file changed, 49 insertions(+)docs/tools/virtiofsd.rst +0
-0@@ -161,6 +161,55 @@ in which case a 'server' rule will always match on all names fromthe server.
docs/tools/virtiofsd.rst +22
-0+xattr-mapping Examples +---------------------- + +1) Prefix all attributes with 'user.virtiofs.' + +:: + +-o xattrmap=":all:prefix::user.virtiofs.::all:bad:::" + + +This uses two rules, using : as the field separator; +the first rule prefixes and strips 'user.virtiofs.', +the second rule hides any non-prefixed attributes that +the host set. + +2) Prefix 'trusted.' attributes, allow others through + +:: + + "/all/prefix/trusted./user.virtiofs./ + /server/bad//trusted./ + /client/bad/user.virtiofs.trusted.//
docs/tools/virtiofsd.rst in which case a 'server' rule will always match on all names from · line 195
Quoted 10 lines
docs/tools/virtiofsd.rst +10
-0+ /all/ok///" + + +Here there are four rules, using / as the field +separator, and also demonstrating that new lines can +be included between rules. +The first rule is the prefixing of 'trusted.'. +The second rule hides unprefixed 'trusted.' attributes +on the host. +The third rule stops a guest from explicitily setting
explicitly
Quoted 6 lines
docs/tools/virtiofsd.rst +6
-0+the 'user.viritofs.trusted.' path directly. +Finally, the fourth rule lets all remaining attributes +through. + +3) Hide 'security.' attributes, and allow everything else +
docs/tools/virtiofsd.rst in which case a 'server' rule will always match on all names from · line 211
Quoted 10 lines
docs/tools/virtiofsd.rst +10
-0+:: + + "/all/bad/security./security./ + /all/ok///' + +The first rule combines what could be separate client and server +rules into a single 'all' rule, matching 'security.' in either +client arguments or lists returned from the host. This stops +the client seeing any 'security.' attributes on the server and +stops it setting any.
extra space.
Jano
Re: [PATCH v2 6/6] tools/virtiofsd: xattr name mapping examples
Quoted 44 lines · * Ján Tomko ([email protected]) wrote:
Quoted 43 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Add a few examples of xattrmaps to the documentation.
Signed-off-by Dr. David Alan Gilbert <[email protected]>---
docs/tools/virtiofsd.rst| 49 ++++++++++++++++++++++++++++++++++++++++1 file changed, 49 insertions(+)docs/tools/virtiofsd.rst +0
-0@@ -161,6 +161,55 @@ in which case a 'server' rule will always match on all names fromthe server.
docs/tools/virtiofsd.rst +26
-0+xattr-mapping Examples +---------------------- + +1) Prefix all attributes with 'user.virtiofs.' + +:: + +-o xattrmap=":all:prefix::user.virtiofs.::all:bad:::" + + +This uses two rules, using : as the field separator; +the first rule prefixes and strips 'user.virtiofs.', +the second rule hides any non-prefixed attributes that +the host set. + +2) Prefix 'trusted.' attributes, allow others through + +:: + + "/all/prefix/trusted./user.virtiofs./ + /server/bad//trusted./ + /client/bad/user.virtiofs.trusted.// + /all/ok///" + + +Here there are four rules, using / as the field
Quoted 8 lines
docs/tools/virtiofsd.rst in which case a 'server' rule will always match on all names from · line 195
Quoted 6 lines
docs/tools/virtiofsd.rst +6
-0+separator, and also demonstrating that new lines can +be included between rules. +The first rule is the prefixing of 'trusted.'. +The second rule hides unprefixed 'trusted.' attributes +on the host. +The third rule stops a guest from explicitily settingexplicitly
Thanks, I'll save that spare 'i' for another time.
Quoted 10 lines
Quoted 10 lines
docs/tools/virtiofsd.rst +10
-0+the 'user.viritofs.trusted.' path directly. +Finally, the fourth rule lets all remaining attributes +through. + +3) Hide 'security.' attributes, and allow everything else + +:: + + "/all/bad/security./security./ + /all/ok///'
Quoted 8 lines
docs/tools/virtiofsd.rst in which case a 'server' rule will always match on all names from · line 211
Quoted 6 lines
docs/tools/virtiofsd.rst +6
-0+ +The first rule combines what could be separate client and server +rules into a single 'all' rule, matching 'security.' in either +client arguments or lists returned from the host. This stops +the client seeing any 'security.' attributes on the server and +stops it setting any.extra space.
Gone.
Quoted 1 line
Reviewed-by Ján Tomko <[email protected]>
Thanks!
Quoted 2 lines
Jano
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK