diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-06-03 02:22:30 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-06-03 02:22:30 +0000 |
| commit | 88cd4b103458fc4bc43b344dad23e88c5bf7f850 (patch) | |
| tree | da475202d204d89aed36e7a4ea68dcc76098da43 /pkg/sentry/socket/unix/unix.go | |
| parent | 272476a6813e871ce68f1d29e3bba92f3e0b6f8f (diff) | |
| parent | e6334e81ca8d951e56f03d8ea0629e3c85556cf1 (diff) | |
Merge release-20200522.0-65-ge6334e81 (automated)
Diffstat (limited to 'pkg/sentry/socket/unix/unix.go')
| -rw-r--r-- | pkg/sentry/socket/unix/unix.go | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkg/sentry/socket/unix/unix.go b/pkg/sentry/socket/unix/unix.go index 5b29e9d7f..c4c9db81b 100644 --- a/pkg/sentry/socket/unix/unix.go +++ b/pkg/sentry/socket/unix/unix.go @@ -417,7 +417,18 @@ func (s *socketOpsCommon) Connect(t *kernel.Task, sockaddr []byte, blocking bool defer ep.Release() // Connect the server endpoint. - return s.ep.Connect(t, ep) + err = s.ep.Connect(t, ep) + + if err == syserr.ErrWrongProtocolForSocket { + // Linux for abstract sockets returns ErrConnectionRefused + // instead of ErrWrongProtocolForSocket. + path, _ := extractPath(sockaddr) + if len(path) > 0 && path[0] == 0 { + err = syserr.ErrConnectionRefused + } + } + + return err } // Write implements fs.FileOperations.Write. |