diff options
author | gVisor bot <gvisor-bot@google.com> | 2020-10-21 19:56:28 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-10-21 19:56:28 +0000 |
commit | 96a310bd32f1baa795a6d0303713f96f6fbcfedb (patch) | |
tree | 8c2c3f243eb3de2530e70ec4372b9c29cccd70eb /pkg/sentry/platform/kvm | |
parent | 1bb5490c643125298570fdb80c20862c367bec58 (diff) | |
parent | 1b2097f84ed3425d4e417a92c08b36e3888b8ebb (diff) |
Merge release-20201019.0-22-g1b2097f84 (automated)
Diffstat (limited to 'pkg/sentry/platform/kvm')
-rw-r--r-- | pkg/sentry/platform/kvm/machine_arm64_unsafe.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/sentry/platform/kvm/machine_arm64_unsafe.go b/pkg/sentry/platform/kvm/machine_arm64_unsafe.go index a163f956d..84992c06d 100644 --- a/pkg/sentry/platform/kvm/machine_arm64_unsafe.go +++ b/pkg/sentry/platform/kvm/machine_arm64_unsafe.go @@ -235,8 +235,9 @@ func (c *vCPU) SwitchToUser(switchOpts ring0.SwitchOpts, info *arch.SignalInfo) return c.fault(int32(syscall.SIGSEGV), info) case ring0.Vector(bounce): // ring0.VirtualizationException return usermem.NoAccess, platform.ErrContextInterrupt - case ring0.El0Sync_undef, - ring0.El1Sync_undef: + case ring0.El0Sync_undef: + return c.fault(int32(syscall.SIGILL), info) + case ring0.El1Sync_undef: *info = arch.SignalInfo{ Signo: int32(syscall.SIGILL), Code: 1, // ILL_ILLOPC (illegal opcode). |