diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-07 21:04:36 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-07 21:04:36 +0000 |
| commit | 012ef31e2457afa1454f6e24d92dff7ff80797bd (patch) | |
| tree | a793a730375c44c4c6ebb8ce489fc0464b28b897 /pkg/sentry/socket/netstack | |
| parent | 03a34f6ddde4ba3c45ace56a6328bf85197625b4 (diff) | |
| parent | 9115f26851b6f00ae01e9c130e3b5b342495c9e5 (diff) | |
Merge release-20200422.0-52-g9115f26 (automated)
Diffstat (limited to 'pkg/sentry/socket/netstack')
| -rwxr-xr-x | pkg/sentry/socket/netstack/netstack_vfs2.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkg/sentry/socket/netstack/netstack_vfs2.go b/pkg/sentry/socket/netstack/netstack_vfs2.go index f7d9b2ff4..191970d41 100755 --- a/pkg/sentry/socket/netstack/netstack_vfs2.go +++ b/pkg/sentry/socket/netstack/netstack_vfs2.go @@ -18,7 +18,6 @@ import ( "gvisor.dev/gvisor/pkg/abi/linux" "gvisor.dev/gvisor/pkg/context" "gvisor.dev/gvisor/pkg/sentry/arch" - "gvisor.dev/gvisor/pkg/sentry/fsimpl/kernfs" "gvisor.dev/gvisor/pkg/sentry/fsimpl/sockfs" "gvisor.dev/gvisor/pkg/sentry/inet" "gvisor.dev/gvisor/pkg/sentry/kernel" @@ -53,8 +52,7 @@ func NewVFS2(t *kernel.Task, family int, skType linux.SockType, protocol int, qu } mnt := t.Kernel().SocketMount() - fs := mnt.Filesystem().Impl().(*kernfs.Filesystem) - d := sockfs.NewDentry(t.Credentials(), fs.NextIno()) + d := sockfs.NewDentry(t.Credentials(), mnt) s := &SocketVFS2{ socketOpsCommon: socketOpsCommon{ |