diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-17 22:19:56 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-17 22:19:56 +0000 |
| commit | f449a00e2f1631aad72d068943bdd139bb897827 (patch) | |
| tree | 12d62137a95279a0a54f2e2dd595cae1b244fba5 /pkg/sentry/socket/netstack | |
| parent | 63e009e612887c2cc2143aefecdf430acf19562e (diff) | |
| parent | a4db85fff210f0f4f2164f0d620c6cfdc288e26c (diff) | |
Merge release-20200907.0-126-ga4db85fff (automated)
Diffstat (limited to 'pkg/sentry/socket/netstack')
| -rw-r--r-- | pkg/sentry/socket/netstack/netstack.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkg/sentry/socket/netstack/netstack.go b/pkg/sentry/socket/netstack/netstack.go index b462924af..33edb1b6f 100644 --- a/pkg/sentry/socket/netstack/netstack.go +++ b/pkg/sentry/socket/netstack/netstack.go @@ -1768,10 +1768,16 @@ func SetSockOpt(t *kernel.Task, s socket.SocketOps, ep commonEndpoint, level int case linux.SOL_IP: return setSockOptIP(t, s, ep, name, optVal) + case linux.SOL_PACKET: + // gVisor doesn't support any SOL_PACKET options just return not + // supported. Returning nil here will result in tcpdump thinking AF_PACKET + // features are supported and proceed to use them and break. + t.Kernel().EmitUnimplementedEvent(t) + return syserr.ErrProtocolNotAvailable + case linux.SOL_UDP, linux.SOL_ICMPV6, - linux.SOL_RAW, - linux.SOL_PACKET: + linux.SOL_RAW: t.Kernel().EmitUnimplementedEvent(t) } |