diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-01-06 19:55:51 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-01-06 19:55:51 +0000 |
| commit | fc3664bf86b303d5b9426adf928a5e7b6753969e (patch) | |
| tree | 3f20350ca49b7d2e421e8f3095a8e6afdd54bde3 /pkg/sentry/kernel/task_exec.go | |
| parent | c2ea432ade043b0c908ba546ddda91de8fa83eca (diff) | |
| parent | 354a15a234c1270bcb9b902503f61835b2ccd2d0 (diff) | |
Merge release-20191213.0-61-g354a15a (automated)
Diffstat (limited to 'pkg/sentry/kernel/task_exec.go')
| -rw-r--r-- | pkg/sentry/kernel/task_exec.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/task_exec.go b/pkg/sentry/kernel/task_exec.go index 90a6190f1..fa6528386 100644 --- a/pkg/sentry/kernel/task_exec.go +++ b/pkg/sentry/kernel/task_exec.go @@ -190,9 +190,11 @@ func (r *runSyscallAfterExecStop) execute(t *Task) taskRunState { t.updateRSSLocked() // Restartable sequence state is discarded. t.rseqPreempted = false - t.rseqCPUAddr = 0 t.rseqCPU = -1 - t.tg.rscr.Store(&RSEQCriticalRegion{}) + t.rseqAddr = 0 + t.rseqSignature = 0 + t.oldRSeqCPUAddr = 0 + t.tg.oldRSeqCritical.Store(&OldRSeqCriticalRegion{}) t.tg.pidns.owner.mu.Unlock() // Remove FDs with the CloseOnExec flag set. |