diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-01-22 00:23:35 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-01-22 00:23:35 +0000 |
| commit | 2cc0a1a4891d5937e8dee7fa275692577dcb09f9 (patch) | |
| tree | dd94b6da9150006f52828731c360739d9a964f75 /pkg/sentry | |
| parent | a09d5cf257f1423502428e08eb59a5315b8b9f94 (diff) | |
| parent | b3405a719cbb33dac2deced192209a5584e5e3d6 (diff) | |
Merge release-20200115.0-58-gb3405a7 (automated)
Diffstat (limited to 'pkg/sentry')
| -rwxr-xr-x | pkg/sentry/platform/ring0/entry_impl_arm64.s | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkg/sentry/platform/ring0/entry_impl_arm64.s b/pkg/sentry/platform/ring0/entry_impl_arm64.s index 5b311df37..876b3a6ba 100755 --- a/pkg/sentry/platform/ring0/entry_impl_arm64.s +++ b/pkg/sentry/platform/ring0/entry_impl_arm64.s @@ -621,6 +621,17 @@ el0_svc: B ·Halt(SB) el0_da: + WORD $0xd538d092 //MRS TPIDR_EL1, R18 + WORD $0xd538601a //MRS FAR_EL1, R26 + + MOVD R26, CPU_FAULT_ADDR(RSV_REG) + + MOVD $1, R3 + MOVD R3, CPU_ERROR_TYPE(RSV_REG) // Set error type to user. + + MOVD $PageFault, R3 + MOVD R3, CPU_VECTOR_CODE(RSV_REG) + B ·Halt(SB) el0_ia: |