summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/socket/unix
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-12-12 19:12:48 +0000
committergVisor bot <gvisor-bot@google.com>2019-12-12 19:12:48 +0000
commitbbea3a5df7d107311788fa34a9e3e633473a3ddc (patch)
tree734d525a1b1c847671a12edee6da60c38a771889 /pkg/sentry/socket/unix
parent9d480fed246fe34f862260177bd437f7e3716a15 (diff)
parent378d6c1f3697b8b939e6632e980562bfc8fb2781 (diff)
Merge release-20191210.0-25-g378d6c1 (automated)
Diffstat (limited to 'pkg/sentry/socket/unix')
-rw-r--r--pkg/sentry/socket/unix/unix.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/sentry/socket/unix/unix.go b/pkg/sentry/socket/unix/unix.go
index 1aaae8487..885758054 100644
--- a/pkg/sentry/socket/unix/unix.go
+++ b/pkg/sentry/socket/unix/unix.go
@@ -118,6 +118,9 @@ func (s *SocketOperations) Endpoint() transport.Endpoint {
func extractPath(sockaddr []byte) (string, *syserr.Error) {
addr, _, err := netstack.AddressAndFamily(linux.AF_UNIX, sockaddr, true /* strict */)
if err != nil {
+ if err == syserr.ErrAddressFamilyNotSupported {
+ err = syserr.ErrInvalidArgument
+ }
return "", err
}