[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 01/10] virtiofsd: Fix breakage due to fuse_init_in size change
From: |
Vivek Goyal |
Subject: |
[PATCH v6 01/10] virtiofsd: Fix breakage due to fuse_init_in size change |
Date: |
Tue, 8 Feb 2022 15:48:04 -0500 |
Kernel version 5.17 has increased the size of "struct fuse_init_in" struct.
Previously this struct was 16 bytes and now it has been extended to
64 bytes in size.
Once qemu headers are updated to latest, it will expect to receive 64 byte
size struct (for protocol version major 7 and minor > 6). But if guest is
booting older kernel (older than 5.17), then it still sends older
fuse_init_in of size 16 bytes. And do_init() fails. It is expecting
64 byte struct. And this results in mount of virtiofs failing.
Fix this by parsing 16 bytes only for now. Separate patches will be
posted which will parse rest of the bytes and enable new functionality.
Right now we don't support any of the new functionality, so we don't
lose anything by not parsing bytes beyond 16.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
tools/virtiofsd/fuse_lowlevel.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
index e4679c73ab..ce29a70253 100644
--- a/tools/virtiofsd/fuse_lowlevel.c
+++ b/tools/virtiofsd/fuse_lowlevel.c
@@ -1880,6 +1880,7 @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid,
struct fuse_mbuf_iter *iter)
{
size_t compat_size = offsetof(struct fuse_init_in, max_readahead);
+ size_t compat2_size = offsetof(struct fuse_init_in, flags) +
sizeof(uint32_t);
struct fuse_init_in *arg;
struct fuse_init_out outarg;
struct fuse_session *se = req->se;
@@ -1897,7 +1898,7 @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid,
/* ...and now consume the new fields. */
if (arg->major == 7 && arg->minor >= 6) {
- if (!fuse_mbuf_iter_advance(iter, sizeof(*arg) - compat_size)) {
+ if (!fuse_mbuf_iter_advance(iter, compat2_size - compat_size)) {
fuse_reply_err(req, EINVAL);
return;
}
--
2.34.1
- [PATCH v6 00/10] virtiofsd: Add support for file security context at file creation, Vivek Goyal, 2022/02/08
- [PATCH v6 04/10] virtiofsd: Extend size of fuse_conn_info->capable and ->want fields, Vivek Goyal, 2022/02/08
- [PATCH v6 05/10] virtiofsd, fuse_lowlevel.c: Add capability to parse security context, Vivek Goyal, 2022/02/08
- [PATCH v6 01/10] virtiofsd: Fix breakage due to fuse_init_in size change,
Vivek Goyal <=
- [PATCH v6 07/10] virtiofsd: Add helpers to work with /proc/self/task/tid/attr/fscreate, Vivek Goyal, 2022/02/08
- [PATCH v6 08/10] virtiofsd: Create new file with security context, Vivek Goyal, 2022/02/08
- [PATCH v6 10/10] virtiofsd: Add an option to enable/disable security label, Vivek Goyal, 2022/02/08
- [PATCH v6 09/10] virtiofsd: Create new file using O_TMPFILE and set security context, Vivek Goyal, 2022/02/08
- [PATCH v6 02/10] linux-headers: Update headers to v5.17-rc1, Vivek Goyal, 2022/02/08
- [PATCH v6 06/10] virtiofsd: Move core file creation code in separate function, Vivek Goyal, 2022/02/08
- [PATCH v6 03/10] virtiofsd: Parse extended "struct fuse_init_in", Vivek Goyal, 2022/02/08