diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-10-30 19:48:30 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-30 19:48:30 +0000 |
| commit | 27c7f1c9cba567579fb7e7065d2fb86157d88ba3 (patch) | |
| tree | de600caf00e123a8b0100f532e10866ae3ebf1ee /pkg | |
| parent | 0cd6b8317400d88d1b59696596238ec995fb15a8 (diff) | |
| parent | c94bf137da809551f2ccdaec061576eb98cceb67 (diff) | |
Merge release-20201019.0-110-gc94bf137d (automated)
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/sentry/platform/kvm/machine_arm64_unsafe.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/platform/kvm/machine_arm64_unsafe.go b/pkg/sentry/platform/kvm/machine_arm64_unsafe.go index 1344ed3c9..c68d96c6f 100644 --- a/pkg/sentry/platform/kvm/machine_arm64_unsafe.go +++ b/pkg/sentry/platform/kvm/machine_arm64_unsafe.go @@ -221,7 +221,7 @@ func (c *vCPU) SwitchToUser(switchOpts ring0.SwitchOpts, info *arch.SignalInfo) if regs := switchOpts.Registers; !ring0.IsCanonical(regs.Pc) { return nonCanonical(regs.Pc, int32(syscall.SIGSEGV), info) } else if !ring0.IsCanonical(regs.Sp) { - return nonCanonical(regs.Sp, int32(syscall.SIGBUS), info) + return nonCanonical(regs.Sp, int32(syscall.SIGSEGV), info) } // Assign PCIDs. |