diff options
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/sentry/platform/platform.go | 3 | ||||
| -rw-r--r-- | pkg/sentry/platform/ptrace/ptrace.go | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkg/sentry/platform/platform.go b/pkg/sentry/platform/platform.go index 6eb2acbd7..8a1620d93 100644 --- a/pkg/sentry/platform/platform.go +++ b/pkg/sentry/platform/platform.go @@ -133,7 +133,8 @@ type Context interface { // - ErrContextSignal: The Context was interrupted by a signal. The // returned *arch.SignalInfo contains information about the signal. If // arch.SignalInfo.Signo == SIGSEGV, the returned usermem.AccessType - // contains the access type of the triggering fault. + // contains the access type of the triggering fault. The caller owns + // the returned SignalInfo. // // - ErrContextInterrupt: The Context was interrupted by a call to // Interrupt(). Switch() may return ErrContextInterrupt spuriously. In diff --git a/pkg/sentry/platform/ptrace/ptrace.go b/pkg/sentry/platform/ptrace/ptrace.go index a44f549a2..4f20716f7 100644 --- a/pkg/sentry/platform/ptrace/ptrace.go +++ b/pkg/sentry/platform/ptrace/ptrace.go @@ -142,9 +142,12 @@ func (c *context) Switch(as platform.AddressSpace, ac arch.Context, cpu int32) ( if isSyscall { return nil, usermem.NoAccess, nil } + + si := c.signalInfo + if faultSP == nil { // Non-fault signal. - return &c.signalInfo, usermem.NoAccess, platform.ErrContextSignal + return &si, usermem.NoAccess, platform.ErrContextSignal } // Got a page fault. Ideally, we'd get real fault type here, but ptrace @@ -168,7 +171,7 @@ func (c *context) Switch(as platform.AddressSpace, ac arch.Context, cpu int32) ( // here, in case this fault was generated by a CPUID exception. There // is no way to distinguish between CPUID-generated faults and regular // page faults. - return &c.signalInfo, at, platform.ErrContextSignalCPUID + return &si, at, platform.ErrContextSignalCPUID } // Interrupt interrupts the running guest application associated with this context. |