diff options
| author | nybidari <59618317+nybidari@users.noreply.github.com> | 2020-02-25 15:33:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 15:33:59 -0800 |
| commit | 818abc2bd5096bf7dc6f621cfd2923bee4e0fc7b (patch) | |
| tree | 0f7f90cecb6afc332a3229651eba4da391a46b41 /pkg/sentry/kernel/rseq.go | |
| parent | acc405ba60834f5dce9ce04cd762d5cda02224cb (diff) | |
| parent | 72e3f3a3eef3a1dc02db0ff71f98a5d7fe89a6e3 (diff) | |
Merge branch 'master' into iptables
Diffstat (limited to 'pkg/sentry/kernel/rseq.go')
| -rw-r--r-- | pkg/sentry/kernel/rseq.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/kernel/rseq.go b/pkg/sentry/kernel/rseq.go index 18416643b..ded95f532 100644 --- a/pkg/sentry/kernel/rseq.go +++ b/pkg/sentry/kernel/rseq.go @@ -304,7 +304,7 @@ func (t *Task) rseqAddrInterrupt() { } var cs linux.RSeqCriticalSection - if _, err := cs.CopyIn(t, critAddr); err != nil { + if err := cs.CopyIn(t, critAddr); err != nil { t.Debugf("Failed to copy critical section from %#x for rseq: %v", critAddr, err) t.forceSignal(linux.SIGSEGV, false /* unconditional */) t.SendSignal(SignalInfoPriv(linux.SIGSEGV)) |