Merge release-20210315.0-15-gacb4c6288 (automated)

4 files changed, 14 insertions, 0 deletions

diff --git a/pkg/sentry/socket/netlink/netlink_state_autogen.go b/pkg/sentry/socket/netlink/netlink_state_autogen.go
index 307498c1c..29c549880 100644
--- a/pkg/sentry/socket/netlink/netlink_state_autogen.go
+++ b/pkg/sentry/socket/netlink/netlink_state_autogen.go
@@ -18,6 +18,7 @@ func (s *Socket) StateFields() []string {
 
 func (s *Socket) beforeSave() {}
 
+// +checklocksignore
 func (s *Socket) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.socketOpsCommon)
@@ -25,6 +26,7 @@ func (s *Socket) StateSave(stateSinkObject state.Sink) {
 
 func (s *Socket) afterLoad() {}
 
+// +checklocksignore
 func (s *Socket) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.socketOpsCommon)
 }
@@ -50,6 +52,7 @@ func (s *socketOpsCommon) StateFields() []string {
 
 func (s *socketOpsCommon) beforeSave() {}
 
+// +checklocksignore
 func (s *socketOpsCommon) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.SendReceiveTimeout)
@@ -66,6 +69,7 @@ func (s *socketOpsCommon) StateSave(stateSinkObject state.Sink) {
 
 func (s *socketOpsCommon) afterLoad() {}
 
+// +checklocksignore
 func (s *socketOpsCommon) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.SendReceiveTimeout)
 	stateSourceObject.Load(1, &s.ports)
@@ -89,12 +93,14 @@ func (k *kernelSCM) StateFields() []string {
 
 func (k *kernelSCM) beforeSave() {}
 
+// +checklocksignore
 func (k *kernelSCM) StateSave(stateSinkObject state.Sink) {
 	k.beforeSave()
 }
 
 func (k *kernelSCM) afterLoad() {}
 
+// +checklocksignore
 func (k *kernelSCM) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -114,6 +120,7 @@ func (s *SocketVFS2) StateFields() []string {
 
 func (s *SocketVFS2) beforeSave() {}
 
+// +checklocksignore
 func (s *SocketVFS2) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.vfsfd)
@@ -125,6 +132,7 @@ func (s *SocketVFS2) StateSave(stateSinkObject state.Sink) {
 
 func (s *SocketVFS2) afterLoad() {}
 
+// +checklocksignore
 func (s *SocketVFS2) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.vfsfd)
 	stateSourceObject.Load(1, &s.FileDescriptionDefaultImpl)
diff --git a/pkg/sentry/socket/netlink/port/port_state_autogen.go b/pkg/sentry/socket/netlink/port/port_state_autogen.go
index e0083fcad..b22471899 100644
--- a/pkg/sentry/socket/netlink/port/port_state_autogen.go
+++ b/pkg/sentry/socket/netlink/port/port_state_autogen.go
@@ -18,6 +18,7 @@ func (m *Manager) StateFields() []string {
 
 func (m *Manager) beforeSave() {}
 
+// +checklocksignore
 func (m *Manager) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	stateSinkObject.Save(0, &m.ports)
@@ -25,6 +26,7 @@ func (m *Manager) StateSave(stateSinkObject state.Sink) {
 
 func (m *Manager) afterLoad() {}
 
+// +checklocksignore
 func (m *Manager) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.ports)
 }
diff --git a/pkg/sentry/socket/netlink/route/route_state_autogen.go b/pkg/sentry/socket/netlink/route/route_state_autogen.go
index 0b263b5b1..c4a94ab49 100644
--- a/pkg/sentry/socket/netlink/route/route_state_autogen.go
+++ b/pkg/sentry/socket/netlink/route/route_state_autogen.go
@@ -16,12 +16,14 @@ func (p *Protocol) StateFields() []string {
 
 func (p *Protocol) beforeSave() {}
 
+// +checklocksignore
 func (p *Protocol) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 }
 
 func (p *Protocol) afterLoad() {}
 
+// +checklocksignore
 func (p *Protocol) StateLoad(stateSourceObject state.Source) {
 }
 
diff --git a/pkg/sentry/socket/netlink/uevent/uevent_state_autogen.go b/pkg/sentry/socket/netlink/uevent/uevent_state_autogen.go
index 63f488594..f45d63d9a 100644
--- a/pkg/sentry/socket/netlink/uevent/uevent_state_autogen.go
+++ b/pkg/sentry/socket/netlink/uevent/uevent_state_autogen.go
@@ -16,12 +16,14 @@ func (p *Protocol) StateFields() []string {
 
 func (p *Protocol) beforeSave() {}
 
+// +checklocksignore
 func (p *Protocol) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 }
 
 func (p *Protocol) afterLoad() {}
 
+// +checklocksignore
 func (p *Protocol) StateLoad(stateSourceObject state.Source) {
 }