summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/socket
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-07-11 13:25:17 +0000
committergVisor bot <gvisor-bot@google.com>2020-07-11 13:25:17 +0000
commit7f634efbfa8ab38b63631bf259a87c5bc7c04bed (patch)
tree81fd34bcc1f69a3020c6a2e40104dff23271114f /pkg/sentry/socket
parent7c2f78ead662934ac0e92d4a3addaec7db6e3cbd (diff)
parent216dcebc066c82907b0de790a77a3deb6a734805 (diff)
Merge release-20200622.1-90-g216dcebc0 (automated)
Diffstat (limited to 'pkg/sentry/socket')
-rw-r--r--pkg/sentry/socket/netstack/netstack.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkg/sentry/socket/netstack/netstack.go b/pkg/sentry/socket/netstack/netstack.go
index 5a3cedd7c..78a842973 100644
--- a/pkg/sentry/socket/netstack/netstack.go
+++ b/pkg/sentry/socket/netstack/netstack.go
@@ -1754,6 +1754,11 @@ func setSockOptSocket(t *kernel.Task, s socket.SocketOps, ep commonEndpoint, nam
return nil
+ case linux.SO_DETACH_FILTER:
+ // optval is ignored.
+ var v tcpip.SocketDetachFilterOption
+ return syserr.TranslateNetstackError(ep.SetSockOpt(v))
+
default:
socket.SetSockOptEmitUnimplementedEvent(t, name)
}