diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-08-12 08:44:47 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-08-12 08:44:47 +0000 |
| commit | 5bd8f886db24151734e03497661e5521d1dfcc48 (patch) | |
| tree | db4948a593ba768c6b14796aa715ffd84473d0a2 /pkg/sentry/kernel/auth | |
| parent | 7e3845c246594cf53f846a6b3adf0b601368dd52 (diff) | |
| parent | 3416a3db77bf80cc1100b7d206fe0b68d424d7c9 (diff) | |
Merge release-20210726.0-57-g3416a3db7 (automated)
Diffstat (limited to 'pkg/sentry/kernel/auth')
| -rw-r--r-- | pkg/sentry/kernel/auth/auth_state_autogen.go | 3 | ||||
| -rw-r--r-- | pkg/sentry/kernel/auth/auth_unsafe_state_autogen.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/auth/auth_state_autogen.go b/pkg/sentry/kernel/auth/auth_state_autogen.go index 5a7f55933..dea316420 100644 --- a/pkg/sentry/kernel/auth/auth_state_autogen.go +++ b/pkg/sentry/kernel/auth/auth_state_autogen.go @@ -141,7 +141,8 @@ func (s *idMapSet) beforeSave() {} // +checklocksignore func (s *idMapSet) StateSave(stateSinkObject state.Sink) { s.beforeSave() - var rootValue *idMapSegmentDataSlices = s.saveRoot() + var rootValue *idMapSegmentDataSlices + rootValue = s.saveRoot() stateSinkObject.SaveValue(0, rootValue) } diff --git a/pkg/sentry/kernel/auth/auth_unsafe_state_autogen.go b/pkg/sentry/kernel/auth/auth_unsafe_state_autogen.go index 61f7e4ce9..28674a087 100644 --- a/pkg/sentry/kernel/auth/auth_unsafe_state_autogen.go +++ b/pkg/sentry/kernel/auth/auth_unsafe_state_autogen.go @@ -21,7 +21,8 @@ func (p *AtomicPtrCredentials) beforeSave() {} // +checklocksignore func (p *AtomicPtrCredentials) StateSave(stateSinkObject state.Sink) { p.beforeSave() - var ptrValue *Credentials = p.savePtr() + var ptrValue *Credentials + ptrValue = p.savePtr() stateSinkObject.SaveValue(0, ptrValue) } |