diff options
| author | Craig Chi <craigchi@google.com> | 2020-08-20 12:31:52 -0700 |
|---|---|---|
| committer | Andrei Vagin <avagin@gmail.com> | 2020-09-16 12:19:30 -0700 |
| commit | 449986264f9277c4c6174fc82294fc6644923e8b (patch) | |
| tree | 919cb0225c8c1e041b4b33b3bbeec4e84f53c2b8 /pkg/sentry/fsimpl/fuse/init.go | |
| parent | 983e30c01616b40348735f894d42bbad204f6b99 (diff) | |
Support multiple FUSE kernel versions of FUSE_INIT response struct
The fuse_init_out struct changes in different FUSE kernel versions. A
FUSE server may implement older versions of fuse_init_out, but they
share common attributes from the beginning. Implement variable-length
marshallable interface to support older versions of ABI.
Fixes #3707
Diffstat (limited to 'pkg/sentry/fsimpl/fuse/init.go')
| -rw-r--r-- | pkg/sentry/fsimpl/fuse/init.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/fsimpl/fuse/init.go b/pkg/sentry/fsimpl/fuse/init.go index 2ff2542b6..6384cbbdb 100644 --- a/pkg/sentry/fsimpl/fuse/init.go +++ b/pkg/sentry/fsimpl/fuse/init.go @@ -76,12 +76,12 @@ func (conn *connection) InitRecv(res *Response, hasSysAdminCap bool) error { return err } - var out linux.FUSEInitOut - if err := res.UnmarshalPayload(&out); err != nil { + initRes := linux.FUSEInitRes{Len: res.DataLen()} + if err := res.UnmarshalPayload(&initRes); err != nil { return err } - return conn.initProcessReply(&out, hasSysAdminCap) + return conn.initProcessReply(&initRes.InitOut, hasSysAdminCap) } // Process the FUSE_INIT reply from the FUSE server. |