diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-01-21 22:10:32 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-01-21 22:10:32 +0000 |
| commit | 1d59262cb8884850d2b28b7d1daa6afb005d21fb (patch) | |
| tree | 0f8870c1eb65bbc8b7b1262b08839049ec9c8caa | |
| parent | 2d57cd18e29d8cd17db5e101da48f1e68cb29227 (diff) | |
| parent | 16694ad2bad01a370d470ec24ff82d819790696c (diff) | |
Merge release-20200115.0-52-g16694ad (automated)
| -rwxr-xr-x | pkg/sentry/platform/ring0/entry_impl_arm64.s | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkg/sentry/platform/ring0/entry_impl_arm64.s b/pkg/sentry/platform/ring0/entry_impl_arm64.s index 36c3d9233..5b311df37 100755 --- a/pkg/sentry/platform/ring0/entry_impl_arm64.s +++ b/pkg/sentry/platform/ring0/entry_impl_arm64.s @@ -608,6 +608,16 @@ TEXT ·El0_sync(SB),NOSPLIT,$0 B el0_invalid el0_svc: + WORD $0xd538d092 //MRS TPIDR_EL1, R18 + + MOVD $0, CPU_ERROR_CODE(RSV_REG) // Clear error code. + + MOVD $1, R3 + MOVD R3, CPU_ERROR_TYPE(RSV_REG) // Set error type to user. + + MOVD $Syscall, R3 + MOVD R3, CPU_VECTOR_CODE(RSV_REG) + B ·Halt(SB) el0_da: |