diff options
author | gVisor bot <gvisor-bot@google.com> | 2019-12-26 21:55:07 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2019-12-26 21:55:07 +0000 |
commit | 79a5db3009bbee6069e28340b0e9c411ac3621a6 (patch) | |
tree | 6618e68fd980e02431dd02aa0a7dbf0b37d1892a /pkg/sentry/platform/ring0/entry_impl_arm64.s | |
parent | 464ba7585f54fa170daa9cdadd0bf9d27e8b82cc (diff) | |
parent | 7b5a59d5038df65a3d5ebb6a24e6b8a2aaa898ab (diff) |
Merge release-20191213.0-51-g7b5a59d (automated)
Diffstat (limited to 'pkg/sentry/platform/ring0/entry_impl_arm64.s')
-rwxr-xr-x | pkg/sentry/platform/ring0/entry_impl_arm64.s | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/sentry/platform/ring0/entry_impl_arm64.s b/pkg/sentry/platform/ring0/entry_impl_arm64.s index 80df36027..d7910a8df 100755 --- a/pkg/sentry/platform/ring0/entry_impl_arm64.s +++ b/pkg/sentry/platform/ring0/entry_impl_arm64.s @@ -618,6 +618,10 @@ TEXT ·Vectors(SB),NOSPLIT,$0 B ·El0_error_invalid(SB) nop31Instructions() + // The exception-vector-table is required to be 11-bits aligned. + // Please see Linux source code as reference: arch/arm64/kernel/entry.s. + // For gvisor, I defined it as 4K in length, filled the 2nd 2K part with NOPs. + // So that, I can safely move the 1st 2K part into the address with 11-bits alignment. WORD $0xd503201f //nop nop31Instructions() WORD $0xd503201f |