From: Vivek Goyal <vgoyal@redhat.com> To: qemu-devel@nongnu.org Cc: virtio-fs@redhat.com, lhenriques@suse.de, dgilbert@redhat.com, vgoyal@redhat.com, miklos@szeredi.hu Subject: [PATCH v6 2/8] virtiofsd: Fix fuse setxattr() API change issue Date: Thu, 17 Jun 2021 14:12:07 -0400 [thread overview] Message-ID: <20210617181213.1177835-3-vgoyal@redhat.com> (raw) In-Reply-To: <20210617181213.1177835-1-vgoyal@redhat.com> With kernel header updates fuse_setxattr_in struct has grown in size. But this new struct size only takes affect if user has opted in for fuse feature FUSE_SETXATTR_EXT otherwise fuse continues to send "fuse_setxattr_in" of older size. Older size is determined by FUSE_COMPAT_SETXATTR_IN_SIZE. Fix this. If we have not opted in for FUSE_SETXATTR_EXT, then expect that we will get fuse_setxattr_in of size FUSE_COMPAT_SETXATTR_IN_SIZE and not sizeof(struct fuse_sexattr_in). Signed-off-by: Vivek Goyal <vgoyal@redhat.com> --- tools/virtiofsd/fuse_common.h | 5 +++++ tools/virtiofsd/fuse_lowlevel.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/virtiofsd/fuse_common.h b/tools/virtiofsd/fuse_common.h index fa9671872e..0c2665b977 100644 --- a/tools/virtiofsd/fuse_common.h +++ b/tools/virtiofsd/fuse_common.h @@ -372,6 +372,11 @@ struct fuse_file_info { */ #define FUSE_CAP_HANDLE_KILLPRIV_V2 (1 << 28) +/** + * Indicates that file server supports extended struct fuse_setxattr_in + */ +#define FUSE_CAP_SETXATTR_EXT (1 << 29) + /** * Ioctl flags * diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c index 7fe2cef1eb..156f1494f5 100644 --- a/tools/virtiofsd/fuse_lowlevel.c +++ b/tools/virtiofsd/fuse_lowlevel.c @@ -1419,8 +1419,13 @@ static void do_setxattr(fuse_req_t req, fuse_ino_t nodeid, struct fuse_setxattr_in *arg; const char *name; const char *value; + bool setxattr_ext = req->se->conn.want & FUSE_CAP_SETXATTR_EXT; + + if (setxattr_ext) + arg = fuse_mbuf_iter_advance(iter, sizeof(*arg)); + else + arg = fuse_mbuf_iter_advance(iter, FUSE_COMPAT_SETXATTR_IN_SIZE); - arg = fuse_mbuf_iter_advance(iter, sizeof(*arg)); name = fuse_mbuf_iter_advance_str(iter); if (!arg || !name) { fuse_reply_err(req, EINVAL); -- 2.25.4
WARNING: multiple messages have this Message-ID (diff)
From: Vivek Goyal <vgoyal@redhat.com> To: qemu-devel@nongnu.org Cc: virtio-fs@redhat.com, vgoyal@redhat.com, miklos@szeredi.hu Subject: [Virtio-fs] [PATCH v6 2/8] virtiofsd: Fix fuse setxattr() API change issue Date: Thu, 17 Jun 2021 14:12:07 -0400 [thread overview] Message-ID: <20210617181213.1177835-3-vgoyal@redhat.com> (raw) In-Reply-To: <20210617181213.1177835-1-vgoyal@redhat.com> With kernel header updates fuse_setxattr_in struct has grown in size. But this new struct size only takes affect if user has opted in for fuse feature FUSE_SETXATTR_EXT otherwise fuse continues to send "fuse_setxattr_in" of older size. Older size is determined by FUSE_COMPAT_SETXATTR_IN_SIZE. Fix this. If we have not opted in for FUSE_SETXATTR_EXT, then expect that we will get fuse_setxattr_in of size FUSE_COMPAT_SETXATTR_IN_SIZE and not sizeof(struct fuse_sexattr_in). Signed-off-by: Vivek Goyal <vgoyal@redhat.com> --- tools/virtiofsd/fuse_common.h | 5 +++++ tools/virtiofsd/fuse_lowlevel.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/virtiofsd/fuse_common.h b/tools/virtiofsd/fuse_common.h index fa9671872e..0c2665b977 100644 --- a/tools/virtiofsd/fuse_common.h +++ b/tools/virtiofsd/fuse_common.h @@ -372,6 +372,11 @@ struct fuse_file_info { */ #define FUSE_CAP_HANDLE_KILLPRIV_V2 (1 << 28) +/** + * Indicates that file server supports extended struct fuse_setxattr_in + */ +#define FUSE_CAP_SETXATTR_EXT (1 << 29) + /** * Ioctl flags * diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c index 7fe2cef1eb..156f1494f5 100644 --- a/tools/virtiofsd/fuse_lowlevel.c +++ b/tools/virtiofsd/fuse_lowlevel.c @@ -1419,8 +1419,13 @@ static void do_setxattr(fuse_req_t req, fuse_ino_t nodeid, struct fuse_setxattr_in *arg; const char *name; const char *value; + bool setxattr_ext = req->se->conn.want & FUSE_CAP_SETXATTR_EXT; + + if (setxattr_ext) + arg = fuse_mbuf_iter_advance(iter, sizeof(*arg)); + else + arg = fuse_mbuf_iter_advance(iter, FUSE_COMPAT_SETXATTR_IN_SIZE); - arg = fuse_mbuf_iter_advance(iter, sizeof(*arg)); name = fuse_mbuf_iter_advance_str(iter); if (!arg || !name) { fuse_reply_err(req, EINVAL); -- 2.25.4
next prev parent reply other threads:[~2021-06-17 18:16 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-17 18:12 [PATCH v6 0/8] virtiofsd: Add support to enable/disable posix acls Vivek Goyal 2021-06-17 18:12 ` [Virtio-fs] " Vivek Goyal 2021-06-17 18:12 ` [PATCH v6 1/8] linux-headers: Update linux headers to 5.13.0-rc6 Vivek Goyal 2021-06-17 18:12 ` [Virtio-fs] " Vivek Goyal 2021-06-17 18:12 ` Vivek Goyal [this message] 2021-06-17 18:12 ` [Virtio-fs] [PATCH v6 2/8] virtiofsd: Fix fuse setxattr() API change issue Vivek Goyal 2021-06-17 18:12 ` [PATCH v6 3/8] virtiofsd: Fix xattr operations overwriting errno Vivek Goyal 2021-06-17 18:12 ` [Virtio-fs] " Vivek Goyal 2021-06-17 18:12 ` [PATCH v6 4/8] virtiofsd: Add support for extended setxattr Vivek Goyal 2021-06-17 18:12 ` [Virtio-fs] " Vivek Goyal 2021-06-17 18:12 ` [PATCH v6 5/8] virtiofsd: Add umask to seccom allow list Vivek Goyal 2021-06-17 18:12 ` [Virtio-fs] " Vivek Goyal 2021-06-17 18:12 ` [PATCH v6 6/8] virtiofsd: Add capability to change/restore umask Vivek Goyal 2021-06-17 18:12 ` [Virtio-fs] " Vivek Goyal 2021-06-17 18:12 ` [PATCH v6 7/8] virtiofsd: Switch creds, drop FSETID for system.posix_acl_access xattr Vivek Goyal 2021-06-17 18:12 ` [Virtio-fs] " Vivek Goyal 2021-06-17 18:12 ` [PATCH v6 8/8] virtiofsd: Add an option to enable/disable posix acls Vivek Goyal 2021-06-17 18:12 ` [Virtio-fs] " Vivek Goyal 2021-06-17 18:24 ` [PATCH v6 0/8] virtiofsd: Add support " no-reply 2021-06-17 18:24 ` [Virtio-fs] " no-reply
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210617181213.1177835-3-vgoyal@redhat.com \ --to=vgoyal@redhat.com \ --cc=dgilbert@redhat.com \ --cc=lhenriques@suse.de \ --cc=miklos@szeredi.hu \ --cc=qemu-devel@nongnu.org \ --cc=virtio-fs@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.