diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-10-28 21:45:28 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-28 21:45:28 +0000 |
| commit | 8085ca843c4d80222f829d7abd27c950e1eeeca2 (patch) | |
| tree | d292a972113a7bb85484b23e5bf27989a54f578e /pkg/sentry/platform | |
| parent | d14d5659224d5c838290e4605256aaac14f6310c (diff) | |
| parent | d20ef61a839efa19bed44a1cfa4a30a247056ffe (diff) | |
Merge release-20201019.0-92-gd20ef61a8 (automated)
Diffstat (limited to 'pkg/sentry/platform')
| -rw-r--r-- | 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 19eb3d090..8009fdd00 100644 --- a/pkg/sentry/platform/ring0/entry_impl_arm64.s +++ b/pkg/sentry/platform/ring0/entry_impl_arm64.s @@ -586,6 +586,10 @@ TEXT ·kernelExitToEl1(SB),NOSPLIT,$0 MOVD CPU_REGISTERS+PTRACE_PC(RSV_REG), R1 MSR R1, ELR_EL1 + // restore sentry's tls. + MOVD CPU_REGISTERS+PTRACE_TLS(RSV_REG), R1 + MSR R1, TPIDR_EL0 + MOVD CPU_REGISTERS+PTRACE_SP(RSV_REG), R1 MOVD R1, RSP |