summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/rseq.go
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-02-20 22:31:43 +0000
committergVisor bot <gvisor-bot@google.com>2020-02-20 22:31:43 +0000
commit1ef036583b04a3a3ac625899d124e4b732281ab3 (patch)
tree6aae8adee759b0a3fb015a997391c9d0733559b8 /pkg/sentry/kernel/rseq.go
parentd3b40e45b3bdc3e444cda9816c4e30924d7c9122 (diff)
parentd90d71474f4c82f742140fdf026821709845cece (diff)
Merge release-20200211.0-55-gd90d714 (automated)
Diffstat (limited to 'pkg/sentry/kernel/rseq.go')
-rw-r--r--pkg/sentry/kernel/rseq.go2
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))