summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-09-10 03:33:18 +0000
committergVisor bot <gvisor-bot@google.com>2021-09-10 03:33:18 +0000
commit5f09b62a58717ce83427f2d8d270604762794809 (patch)
treeaf8cd887474e163a3ac062d3f271936db813687d /pkg/sentry
parent0e636a3408aac3cb6d9880a42ee217a48afa199b (diff)
parent2572af38860ed8a5aa37f0ad705a360628a4ed10 (diff)
Merge release-20210830.0-30-g2572af388 (automated)
Diffstat (limited to 'pkg/sentry')
-rw-r--r--pkg/sentry/socket/socket.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/sentry/socket/socket.go b/pkg/sentry/socket/socket.go
index 83b9d9389..841d5bd55 100644
--- a/pkg/sentry/socket/socket.go
+++ b/pkg/sentry/socket/socket.go
@@ -743,6 +743,8 @@ func AddressAndFamily(addr []byte) (tcpip.FullAddress, uint16, *syserr.Error) {
return tcpip.FullAddress{}, family, syserr.ErrInvalidArgument
}
a.UnmarshalUnsafe(addr[:sockAddrLinkSize])
+ // TODO(https://gvisor.dev/issue/6530): Do not assume all interfaces have
+ // an ethernet address.
if a.Family != linux.AF_PACKET || a.HardwareAddrLen != header.EthernetAddressSize {
return tcpip.FullAddress{}, family, syserr.ErrInvalidArgument
}