diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-12-12 19:12:48 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-12-12 19:12:48 +0000 |
| commit | bbea3a5df7d107311788fa34a9e3e633473a3ddc (patch) | |
| tree | 734d525a1b1c847671a12edee6da60c38a771889 /pkg/sentry/socket/netstack/netstack.go | |
| parent | 9d480fed246fe34f862260177bd437f7e3716a15 (diff) | |
| parent | 378d6c1f3697b8b939e6632e980562bfc8fb2781 (diff) | |
Merge release-20191210.0-25-g378d6c1 (automated)
Diffstat (limited to 'pkg/sentry/socket/netstack/netstack.go')
| -rwxr-xr-x | pkg/sentry/socket/netstack/netstack.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/socket/netstack/netstack.go b/pkg/sentry/socket/netstack/netstack.go index 8a6522eac..140851c17 100755 --- a/pkg/sentry/socket/netstack/netstack.go +++ b/pkg/sentry/socket/netstack/netstack.go @@ -326,7 +326,7 @@ func AddressAndFamily(sfamily int, addr []byte, strict bool) (tcpip.FullAddress, } family := usermem.ByteOrder.Uint16(addr) - if family != uint16(sfamily) && (!strict && family != linux.AF_UNSPEC) { + if family != uint16(sfamily) && (strict || family != linux.AF_UNSPEC) { return tcpip.FullAddress{}, family, syserr.ErrAddressFamilyNotSupported } |