summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/socket/netstack/provider.go
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-05-01 19:57:37 +0000
committergVisor bot <gvisor-bot@google.com>2020-05-01 19:57:37 +0000
commit60804f3bb0fdc597ea153ba6750553ea1b908104 (patch)
tree382149ca0e50c9880db4866dd3f046eaeca4a4f7 /pkg/sentry/socket/netstack/provider.go
parentcbdef9bd094e532f3d97404e3d08f952d2dcb7c3 (diff)
parent82bae30ceea0984c94af3085866b58ec9e69ea67 (diff)
Merge release-20200422.0-9-g82bae30 (automated)
Diffstat (limited to 'pkg/sentry/socket/netstack/provider.go')
-rwxr-xr-xpkg/sentry/socket/netstack/provider.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/sentry/socket/netstack/provider.go b/pkg/sentry/socket/netstack/provider.go
index c3f04b613..ead3b2b79 100755
--- a/pkg/sentry/socket/netstack/provider.go
+++ b/pkg/sentry/socket/netstack/provider.go
@@ -33,6 +33,8 @@ import (
"gvisor.dev/gvisor/pkg/waiter"
)
+// LINT.IfChange
+
// provider is an inet socket provider.
type provider struct {
family int
@@ -167,6 +169,8 @@ func packetSocket(t *kernel.Task, epStack *Stack, stype linux.SockType, protocol
return New(t, linux.AF_PACKET, stype, protocol, wq, ep)
}
+// LINT.ThenChange(./provider_vfs2.go)
+
// Pair just returns nil sockets (not supported).
func (*provider) Pair(*kernel.Task, linux.SockType, int) (*fs.File, *fs.File, *syserr.Error) {
return nil, nil, nil