diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-02-09 02:07:16 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-02-09 02:07:16 +0000 |
| commit | 1733f9c93caddce0e0717c4f21fa4dc04644b1ba (patch) | |
| tree | 2a189512403480979db9e346290c7566c7a83c22 /pkg | |
| parent | d2f0aebf95aa87a194a47aa454b52cdf491550f8 (diff) | |
| parent | e51f775cbb8db89d1dac6dcf584be5eef1f82d3c (diff) | |
Merge release-20210201.0-56-ge51f775cb (automated)
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/sentry/syscalls/linux/sys_socket.go | 3 | ||||
| -rw-r--r-- | pkg/sentry/syscalls/linux/vfs2/socket.go | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkg/sentry/syscalls/linux/sys_socket.go b/pkg/sentry/syscalls/linux/sys_socket.go index fe45225c1..686392cc8 100644 --- a/pkg/sentry/syscalls/linux/sys_socket.go +++ b/pkg/sentry/syscalls/linux/sys_socket.go @@ -18,7 +18,6 @@ import ( "time" "gvisor.dev/gvisor/pkg/abi/linux" - "gvisor.dev/gvisor/pkg/binary" "gvisor.dev/gvisor/pkg/marshal" "gvisor.dev/gvisor/pkg/marshal/primitive" "gvisor.dev/gvisor/pkg/sentry/arch" @@ -457,7 +456,7 @@ func GetSockOpt(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.Sy return 0, nil, e.ToError() } - vLen := int32(binary.Size(v)) + vLen := int32(v.SizeBytes()) if _, err := primitive.CopyInt32Out(t, optLenAddr, vLen); err != nil { return 0, nil, err } diff --git a/pkg/sentry/syscalls/linux/vfs2/socket.go b/pkg/sentry/syscalls/linux/vfs2/socket.go index f5795b4a8..7636ca453 100644 --- a/pkg/sentry/syscalls/linux/vfs2/socket.go +++ b/pkg/sentry/syscalls/linux/vfs2/socket.go @@ -18,7 +18,6 @@ import ( "time" "gvisor.dev/gvisor/pkg/abi/linux" - "gvisor.dev/gvisor/pkg/binary" "gvisor.dev/gvisor/pkg/marshal" "gvisor.dev/gvisor/pkg/marshal/primitive" "gvisor.dev/gvisor/pkg/sentry/arch" @@ -460,7 +459,7 @@ func GetSockOpt(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.Sy return 0, nil, e.ToError() } - vLen := int32(binary.Size(v)) + vLen := int32(v.SizeBytes()) if _, err := primitive.CopyInt32Out(t, optLenAddr, vLen); err != nil { return 0, nil, err } |