diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-11-08 08:50:32 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-11-08 08:50:32 +0000 |
| commit | a42ea3ee63e8ba6b3a39cd1c86a879116f90fe8e (patch) | |
| tree | f07ae539a9201f5fd9c88b6894343dc83c189a49 /pkg/sentry/syscalls/linux | |
| parent | 2c3ddc4dbfa7a32f08cb25cfa7cbf1b86245c3e5 (diff) | |
| parent | 510bad19b6a71aec63b351e24b08cf6596c871b3 (diff) | |
Merge release-20211101.0-23-g510bad19b (automated)
Diffstat (limited to 'pkg/sentry/syscalls/linux')
| -rw-r--r-- | pkg/sentry/syscalls/linux/linux_abi_autogen_unsafe.go | 8 | ||||
| -rw-r--r-- | pkg/sentry/syscalls/linux/vfs2/vfs2_abi_autogen_unsafe.go | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkg/sentry/syscalls/linux/linux_abi_autogen_unsafe.go b/pkg/sentry/syscalls/linux/linux_abi_autogen_unsafe.go index 2ebafff21..bec14ebfa 100644 --- a/pkg/sentry/syscalls/linux/linux_abi_autogen_unsafe.go +++ b/pkg/sentry/syscalls/linux/linux_abi_autogen_unsafe.go @@ -29,7 +29,7 @@ func (d *direntHdr) SizeBytes() int { // MarshalBytes implements marshal.Marshallable.MarshalBytes. func (d *direntHdr) MarshalBytes(dst []byte) []byte { - dst = d.OldHdr.MarshalBytes(dst) + dst = d.OldHdr.MarshalUnsafe(dst) dst[0] = byte(d.Typ) dst = dst[1:] return dst @@ -37,7 +37,7 @@ func (d *direntHdr) MarshalBytes(dst []byte) []byte { // UnmarshalBytes implements marshal.Marshallable.UnmarshalBytes. func (d *direntHdr) UnmarshalBytes(src []byte) []byte { - src = d.OldHdr.UnmarshalBytes(src) + src = d.OldHdr.UnmarshalUnsafe(src) d.Typ = uint8(src[0]) src = src[1:] return src @@ -611,7 +611,7 @@ func (m *multipleMessageHeader64) SizeBytes() int { // MarshalBytes implements marshal.Marshallable.MarshalBytes. func (m *multipleMessageHeader64) MarshalBytes(dst []byte) []byte { - dst = m.msgHdr.MarshalBytes(dst) + dst = m.msgHdr.MarshalUnsafe(dst) hostarch.ByteOrder.PutUint32(dst[:4], uint32(m.msgLen)) dst = dst[4:] // Padding: dst[:sizeof(int32)] ~= int32(0) @@ -621,7 +621,7 @@ func (m *multipleMessageHeader64) MarshalBytes(dst []byte) []byte { // UnmarshalBytes implements marshal.Marshallable.UnmarshalBytes. func (m *multipleMessageHeader64) UnmarshalBytes(src []byte) []byte { - src = m.msgHdr.UnmarshalBytes(src) + src = m.msgHdr.UnmarshalUnsafe(src) m.msgLen = uint32(hostarch.ByteOrder.Uint32(src[:4])) src = src[4:] // Padding: var _ int32 ~= src[:sizeof(int32)] diff --git a/pkg/sentry/syscalls/linux/vfs2/vfs2_abi_autogen_unsafe.go b/pkg/sentry/syscalls/linux/vfs2/vfs2_abi_autogen_unsafe.go index fbbb520b9..387f825d8 100644 --- a/pkg/sentry/syscalls/linux/vfs2/vfs2_abi_autogen_unsafe.go +++ b/pkg/sentry/syscalls/linux/vfs2/vfs2_abi_autogen_unsafe.go @@ -251,7 +251,7 @@ func (m *multipleMessageHeader64) SizeBytes() int { // MarshalBytes implements marshal.Marshallable.MarshalBytes. func (m *multipleMessageHeader64) MarshalBytes(dst []byte) []byte { - dst = m.msgHdr.MarshalBytes(dst) + dst = m.msgHdr.MarshalUnsafe(dst) hostarch.ByteOrder.PutUint32(dst[:4], uint32(m.msgLen)) dst = dst[4:] // Padding: dst[:sizeof(int32)] ~= int32(0) @@ -261,7 +261,7 @@ func (m *multipleMessageHeader64) MarshalBytes(dst []byte) []byte { // UnmarshalBytes implements marshal.Marshallable.UnmarshalBytes. func (m *multipleMessageHeader64) UnmarshalBytes(src []byte) []byte { - src = m.msgHdr.UnmarshalBytes(src) + src = m.msgHdr.UnmarshalUnsafe(src) m.msgLen = uint32(hostarch.ByteOrder.Uint32(src[:4])) src = src[4:] // Padding: var _ int32 ~= src[:sizeof(int32)] |