summaryrefslogtreecommitdiffhomepage
path: root/pkg
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-10-01 01:29:33 +0000
committergVisor bot <gvisor-bot@google.com>2020-10-01 01:29:33 +0000
commitc4f3063255be4a9adc2486e1875df85bd363c6c8 (patch)
tree4577e6c8b48f790d2b67f6a10fc6bc24a3de0cb2 /pkg
parent84728967e805932585c943e560987056bd9e2445 (diff)
parentcb41f6703160dcb18242cd912db86983540af595 (diff)
Merge release-20200921.0-96-gcb41f6703 (automated)
Diffstat (limited to 'pkg')
-rw-r--r--pkg/sentry/fsimpl/host/socket.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/fsimpl/host/socket.go b/pkg/sentry/fsimpl/host/socket.go
index 131145b85..8a447e29f 100644
--- a/pkg/sentry/fsimpl/host/socket.go
+++ b/pkg/sentry/fsimpl/host/socket.go
@@ -348,10 +348,10 @@ func (e *SCMConnectedEndpoint) Init() error {
func (e *SCMConnectedEndpoint) Release(ctx context.Context) {
e.DecRef(func() {
e.mu.Lock()
+ fdnotifier.RemoveFD(int32(e.fd))
if err := syscall.Close(e.fd); err != nil {
log.Warningf("Failed to close host fd %d: %v", err)
}
- fdnotifier.RemoveFD(int32(e.fd))
e.destroyLocked()
e.mu.Unlock()
})