diff options
| author | Andrei Vagin <avagin@google.com> | 2019-06-27 13:23:49 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-06-27 13:59:57 -0700 |
| commit | e2760839033618410cdea9aeab039e096cde54be (patch) | |
| tree | a396466730e085b72e5608493f095de5ff575784 | |
| parent | 7188790f92444e3e817a62606745ecc05cb181a5 (diff) | |
gvisor/ptrace: grub initial thread registers only once
PiperOrigin-RevId: 255465635
| -rw-r--r-- | pkg/sentry/platform/ptrace/subprocess.go | 4 | ||||
| -rw-r--r-- | pkg/sentry/platform/ptrace/subprocess_linux.go | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/pkg/sentry/platform/ptrace/subprocess.go b/pkg/sentry/platform/ptrace/subprocess.go index f15b3415a..46f9d3fb6 100644 --- a/pkg/sentry/platform/ptrace/subprocess.go +++ b/pkg/sentry/platform/ptrace/subprocess.go @@ -155,6 +155,7 @@ func newSubprocess(create func() (*thread, error)) (*subprocess, error) { errChan <- err return } + firstThread.grabInitRegs() // Ready to handle requests. errChan <- nil @@ -179,6 +180,7 @@ func newSubprocess(create func() (*thread, error)) (*subprocess, error) { // Detach the thread. t.detach() + t.initRegs = firstThread.initRegs // Return the thread. r <- t @@ -269,7 +271,9 @@ func (t *thread) attach() { // Initialize options. t.init() +} +func (t *thread) grabInitRegs() { // Grab registers. // // Note that we adjust the current register RIP value to be just before diff --git a/pkg/sentry/platform/ptrace/subprocess_linux.go b/pkg/sentry/platform/ptrace/subprocess_linux.go index 84d4cf0bd..dc3475494 100644 --- a/pkg/sentry/platform/ptrace/subprocess_linux.go +++ b/pkg/sentry/platform/ptrace/subprocess_linux.go @@ -235,6 +235,7 @@ func attachedThread(flags uintptr, defaultAction linux.BPFAction) (*thread, erro return nil, fmt.Errorf("wait failed: expected SIGSTOP, got %v", sig) } t.attach() + t.grabInitRegs() return t, nil } |