diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-04-01 06:00:41 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-04-01 06:00:41 +0000 |
| commit | 098281cb49d3119ea7b1f221fb6c74694b2692e7 (patch) | |
| tree | e46134f447bb0153b935e769e20898911c29db75 /pkg/sentry/kernel | |
| parent | bbba7a4527f117b6e4a3fe64e816b3e9ef4a6300 (diff) | |
| parent | 840980aeba0b5224b13bcaadf5785ac5305a5230 (diff) | |
Merge release-20200323.0-45-g840980a (automated)
Diffstat (limited to 'pkg/sentry/kernel')
| -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 ded95f532..18416643b 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)) |