diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-12-02 19:39:12 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-12-02 19:39:12 +0000 |
| commit | 073f88c1bf9c665bddc683249552c5d14b86f345 (patch) | |
| tree | 0e68f8574152a97a402b01c6c26322a3abf5903a /pkg/sentry/strace | |
| parent | 6e7abae1422faede10414432c3cfa13b24957466 (diff) | |
| parent | 1375a87a209ef1a2523ada84254e3a0101afb4f5 (diff) | |
Merge release-20201117.0-97-g1375a87a2 (automated)
Diffstat (limited to 'pkg/sentry/strace')
| -rw-r--r-- | pkg/sentry/strace/socket.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/strace/socket.go b/pkg/sentry/strace/socket.go index cc5f70cd4..d943a7cb1 100644 --- a/pkg/sentry/strace/socket.go +++ b/pkg/sentry/strace/socket.go @@ -23,8 +23,8 @@ import ( "gvisor.dev/gvisor/pkg/binary" "gvisor.dev/gvisor/pkg/marshal/primitive" "gvisor.dev/gvisor/pkg/sentry/kernel" + "gvisor.dev/gvisor/pkg/sentry/socket" "gvisor.dev/gvisor/pkg/sentry/socket/netlink" - "gvisor.dev/gvisor/pkg/sentry/socket/netstack" slinux "gvisor.dev/gvisor/pkg/sentry/syscalls/linux" "gvisor.dev/gvisor/pkg/usermem" ) @@ -341,7 +341,7 @@ func sockAddr(t *kernel.Task, addr usermem.Addr, length uint32) string { switch family { case linux.AF_INET, linux.AF_INET6, linux.AF_UNIX: - fa, _, err := netstack.AddressAndFamily(b) + fa, _, err := socket.AddressAndFamily(b) if err != nil { return fmt.Sprintf("%#x {Family: %s, error extracting address: %v}", addr, familyStr, err) } |