Merge release-20210927.0-31-g6f6cf522e (automated)

9 files changed, 44 insertions, 79 deletions

diff --git a/pkg/eventchannel/eventchannel_go_proto/event.pb.go b/pkg/eventchannel/eventchannel_go_proto/event.pb.go
index 1d0812479..2c914495b 100644
--- a/pkg/eventchannel/eventchannel_go_proto/event.pb.go
+++ b/pkg/eventchannel/eventchannel_go_proto/event.pb.go
@@ -1,13 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.25.0
-// 	protoc        v3.13.0
+// 	protoc-gen-go v1.27.1
+// 	protoc        v3.17.0
 // source: pkg/eventchannel/event.proto
 
-package gvisor
+package eventchannel_go_proto
 
 import (
-	proto "github.com/golang/protobuf/proto"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -21,10 +20,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
 type DebugEvent struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
diff --git a/pkg/metric/metric_go_proto/metric.pb.go b/pkg/metric/metric_go_proto/metric.pb.go
index 7d327e3a0..d690d605d 100644
--- a/pkg/metric/metric_go_proto/metric.pb.go
+++ b/pkg/metric/metric_go_proto/metric.pb.go
@@ -1,16 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.25.0
-// 	protoc        v3.13.0
+// 	protoc-gen-go v1.27.1
+// 	protoc        v3.17.0
 // source: pkg/metric/metric.proto
 
-package gvisor
+package metric_go_proto
 
 import (
-	proto "github.com/golang/protobuf/proto"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 	reflect "reflect"
 	sync "sync"
 )
@@ -22,10 +21,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
 type MetricMetadata_Type int32
 
 const (
@@ -352,9 +347,9 @@ type StageTiming struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Stage   string               `protobuf:"bytes,1,opt,name=stage,proto3" json:"stage,omitempty"`
-	Started *timestamp.Timestamp `protobuf:"bytes,2,opt,name=started,proto3" json:"started,omitempty"`
-	Ended   *timestamp.Timestamp `protobuf:"bytes,3,opt,name=ended,proto3" json:"ended,omitempty"`
+	Stage   string                 `protobuf:"bytes,1,opt,name=stage,proto3" json:"stage,omitempty"`
+	Started *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=started,proto3" json:"started,omitempty"`
+	Ended   *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=ended,proto3" json:"ended,omitempty"`
 }
 
 func (x *StageTiming) Reset() {
@@ -396,14 +391,14 @@ func (x *StageTiming) GetStage() string {
 	return ""
 }
 
-func (x *StageTiming) GetStarted() *timestamp.Timestamp {
+func (x *StageTiming) GetStarted() *timestamppb.Timestamp {
 	if x != nil {
 		return x.Started
 	}
 	return nil
 }
 
-func (x *StageTiming) GetEnded() *timestamp.Timestamp {
+func (x *StageTiming) GetEnded() *timestamppb.Timestamp {
 	if x != nil {
 		return x.Ended
 	}
@@ -602,15 +597,15 @@ func file_pkg_metric_metric_proto_rawDescGZIP() []byte {
 var file_pkg_metric_metric_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
 var file_pkg_metric_metric_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
 var file_pkg_metric_metric_proto_goTypes = []interface{}{
-	(MetricMetadata_Type)(0),     // 0: gvisor.MetricMetadata.Type
-	(MetricMetadata_Units)(0),    // 1: gvisor.MetricMetadata.Units
-	(*MetricMetadata)(nil),       // 2: gvisor.MetricMetadata
-	(*MetricRegistration)(nil),   // 3: gvisor.MetricRegistration
-	(*MetricValue)(nil),          // 4: gvisor.MetricValue
-	(*StageTiming)(nil),          // 5: gvisor.StageTiming
-	(*MetricUpdate)(nil),         // 6: gvisor.MetricUpdate
-	(*MetricMetadata_Field)(nil), // 7: gvisor.MetricMetadata.Field
-	(*timestamp.Timestamp)(nil),  // 8: google.protobuf.Timestamp
+	(MetricMetadata_Type)(0),      // 0: gvisor.MetricMetadata.Type
+	(MetricMetadata_Units)(0),     // 1: gvisor.MetricMetadata.Units
+	(*MetricMetadata)(nil),        // 2: gvisor.MetricMetadata
+	(*MetricRegistration)(nil),    // 3: gvisor.MetricRegistration
+	(*MetricValue)(nil),           // 4: gvisor.MetricValue
+	(*StageTiming)(nil),           // 5: gvisor.StageTiming
+	(*MetricUpdate)(nil),          // 6: gvisor.MetricUpdate
+	(*MetricMetadata_Field)(nil),  // 7: gvisor.MetricMetadata.Field
+	(*timestamppb.Timestamp)(nil), // 8: google.protobuf.Timestamp
 }
 var file_pkg_metric_metric_proto_depIdxs = []int32{
 	0, // 0: gvisor.MetricMetadata.type:type_name -> gvisor.MetricMetadata.Type
diff --git a/pkg/sentry/arch/registers_go_proto/registers.pb.go b/pkg/sentry/arch/registers_go_proto/registers.pb.go
index 0e73a10b8..a26b40a6c 100644
--- a/pkg/sentry/arch/registers_go_proto/registers.pb.go
+++ b/pkg/sentry/arch/registers_go_proto/registers.pb.go
@@ -1,13 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.25.0
-// 	protoc        v3.13.0
+// 	protoc-gen-go v1.27.1
+// 	protoc        v3.17.0
 // source: pkg/sentry/arch/registers.proto
 
-package gvisor
+package registers_go_proto
 
 import (
-	proto "github.com/golang/protobuf/proto"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -21,10 +20,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
 type AMD64Registers struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
diff --git a/pkg/sentry/control/control_go_proto/control.pb.go b/pkg/sentry/control/control_go_proto/control.pb.go
index 386b74ff3..bd4a82b05 100644
--- a/pkg/sentry/control/control_go_proto/control.pb.go
+++ b/pkg/sentry/control/control_go_proto/control.pb.go
@@ -1,13 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.25.0
-// 	protoc        v3.13.0
+// 	protoc-gen-go v1.27.1
+// 	protoc        v3.17.0
 // source: pkg/sentry/control/control.proto
 
-package gvisor
+package control_go_proto
 
 import (
-	proto "github.com/golang/protobuf/proto"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -21,10 +20,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
 type ControlConfig_Endpoint int32
 
 const (
diff --git a/pkg/sentry/kernel/memevent/memory_events_go_proto/memory_events.pb.go b/pkg/sentry/kernel/memevent/memory_events_go_proto/memory_events.pb.go
index ed1b8a8ca..e960b9a37 100644
--- a/pkg/sentry/kernel/memevent/memory_events_go_proto/memory_events.pb.go
+++ b/pkg/sentry/kernel/memevent/memory_events_go_proto/memory_events.pb.go
@@ -1,13 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.25.0
-// 	protoc        v3.13.0
+// 	protoc-gen-go v1.27.1
+// 	protoc        v3.17.0
 // source: pkg/sentry/kernel/memevent/memory_events.proto
 
-package gvisor
+package memory_events_go_proto
 
 import (
-	proto "github.com/golang/protobuf/proto"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -21,10 +20,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
 type MemoryUsageEvent struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
diff --git a/pkg/sentry/kernel/uncaught_signal_go_proto/uncaught_signal.pb.go b/pkg/sentry/kernel/uncaught_signal_go_proto/uncaught_signal.pb.go
index 54955f061..f5476fdb1 100644
--- a/pkg/sentry/kernel/uncaught_signal_go_proto/uncaught_signal.pb.go
+++ b/pkg/sentry/kernel/uncaught_signal_go_proto/uncaught_signal.pb.go
@@ -1,13 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.25.0
-// 	protoc        v3.13.0
+// 	protoc-gen-go v1.27.1
+// 	protoc        v3.17.0
 // source: pkg/sentry/kernel/uncaught_signal.proto
 
-package gvisor
+package uncaught_signal_go_proto
 
 import (
-	proto "github.com/golang/protobuf/proto"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	registers_go_proto "gvisor.dev/gvisor/pkg/sentry/arch/registers_go_proto"
@@ -22,10 +21,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
 type UncaughtSignal struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
diff --git a/pkg/sentry/strace/strace_go_proto/strace.pb.go b/pkg/sentry/strace/strace_go_proto/strace.pb.go
index f3d5c1108..25cd6830e 100644
--- a/pkg/sentry/strace/strace_go_proto/strace.pb.go
+++ b/pkg/sentry/strace/strace_go_proto/strace.pb.go
@@ -1,13 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.25.0
-// 	protoc        v3.13.0
+// 	protoc-gen-go v1.27.1
+// 	protoc        v3.17.0
 // source: pkg/sentry/strace/strace.proto
 
-package gvisor
+package strace_go_proto
 
 import (
-	proto "github.com/golang/protobuf/proto"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -21,10 +20,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
 type Strace struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
diff --git a/pkg/sentry/unimpl/unimplemented_syscall_go_proto/unimplemented_syscall.pb.go b/pkg/sentry/unimpl/unimplemented_syscall_go_proto/unimplemented_syscall.pb.go
index aa85c330a..ca742841e 100644
--- a/pkg/sentry/unimpl/unimplemented_syscall_go_proto/unimplemented_syscall.pb.go
+++ b/pkg/sentry/unimpl/unimplemented_syscall_go_proto/unimplemented_syscall.pb.go
@@ -1,13 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.25.0
-// 	protoc        v3.13.0
+// 	protoc-gen-go v1.27.1
+// 	protoc        v3.17.0
 // source: pkg/sentry/unimpl/unimplemented_syscall.proto
 
-package gvisor
+package unimplemented_syscall_go_proto
 
 import (
-	proto "github.com/golang/protobuf/proto"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	registers_go_proto "gvisor.dev/gvisor/pkg/sentry/arch/registers_go_proto"
@@ -22,10 +21,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
 type UnimplementedSyscall struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
diff --git a/runsc/boot/filter/config.go b/runsc/boot/filter/config.go
index d875aa334..db363435b 100644
--- a/runsc/boot/filter/config.go
+++ b/runsc/boot/filter/config.go
@@ -646,6 +646,11 @@ func hostInetFilters() seccomp.SyscallRules {
 
 func controlServerFilters(fd int) seccomp.SyscallRules {
 	return seccomp.SyscallRules{
+		unix.SYS_ACCEPT4: []seccomp.Rule{
+			{
+				seccomp.EqualTo(fd),
+			},
+		},
 		unix.SYS_ACCEPT: []seccomp.Rule{
 			{
 				seccomp.EqualTo(fd),