diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-02-25 21:48:45 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-02-25 21:48:45 +0000 |
| commit | 252dac4e03e749ead75db6ba10b1d79603d9d1a7 (patch) | |
| tree | a142c411962110bffd4ec55c0def6db6087e4287 /pkg/sentry/kernel/task_exec.go | |
| parent | d2b2e5e17a8664653211e763204cc01b78b5c7a9 (diff) | |
| parent | 72e3f3a3eef3a1dc02db0ff71f98a5d7fe89a6e3 (diff) | |
Merge release-20200219.0-40-g72e3f3a (automated)
Diffstat (limited to 'pkg/sentry/kernel/task_exec.go')
| -rw-r--r-- | pkg/sentry/kernel/task_exec.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/kernel/task_exec.go b/pkg/sentry/kernel/task_exec.go index 8f57a34a6..00c425cca 100644 --- a/pkg/sentry/kernel/task_exec.go +++ b/pkg/sentry/kernel/task_exec.go @@ -220,7 +220,7 @@ func (r *runSyscallAfterExecStop) execute(t *Task) taskRunState { t.mu.Unlock() t.unstopVforkParent() // NOTE(b/30316266): All locks must be dropped prior to calling Activate. - t.MemoryManager().Activate() + t.MemoryManager().Activate(t) t.ptraceExec(oldTID) return (*runSyscallExit)(nil) |