diff options
| author | Dean Deng <deandeng@google.com> | 2020-08-17 11:40:08 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-08-17 11:42:20 -0700 |
| commit | 3bd066d5032c297e501f5c71be301ffa2fe9ed34 (patch) | |
| tree | f689175cdbabf2ca52c76d111fafe0e3450f5a0c /pkg/sentry/socket/unix/unix_vfs2.go | |
| parent | 58154194b3e472cf476be6bf0530bf271d1d29f8 (diff) | |
Remove weak references from unix sockets.
The abstract socket namespace no longer holds any references on sockets.
Instead, TryIncRef() is used when a socket is being retrieved in
BoundEndpoint(). Abstract sockets are now responsible for removing themselves
from the namespace they are in, when they are destroyed.
Updates #1486.
PiperOrigin-RevId: 327064173
Diffstat (limited to 'pkg/sentry/socket/unix/unix_vfs2.go')
| -rw-r--r-- | pkg/sentry/socket/unix/unix_vfs2.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkg/sentry/socket/unix/unix_vfs2.go b/pkg/sentry/socket/unix/unix_vfs2.go index dfa25241a..d066ef8ab 100644 --- a/pkg/sentry/socket/unix/unix_vfs2.go +++ b/pkg/sentry/socket/unix/unix_vfs2.go @@ -183,10 +183,14 @@ func (s *SocketVFS2) Bind(t *kernel.Task, sockaddr []byte) *syserr.Error { if t.IsNetworkNamespaced() { return syserr.ErrInvalidEndpointState } - if err := t.AbstractSockets().Bind(t, p[1:], bep, s); err != nil { + asn := t.AbstractSockets() + name := p[1:] + if err := asn.Bind(t, name, bep, s); err != nil { // syserr.ErrPortInUse corresponds to EADDRINUSE. return syserr.ErrPortInUse } + s.abstractName = name + s.abstractNamespace = asn } else { path := fspath.Parse(p) root := t.FSContext().RootDirectoryVFS2() |