From 2e8b96b4fd747617bcaba795720708940e5fae22 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Tue, 7 Mar 2023 13:50:44 -0800 Subject: [PATCH] Automated rollback of changelist 514487900 PiperOrigin-RevId: 514829815 --- pkg/sentry/platform/systrap/sysmsg/sighandler_arm64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/sentry/platform/systrap/sysmsg/sighandler_arm64.c b/pkg/sentry/platform/systrap/sysmsg/sighandler_arm64.c index 2594ae57d..1fe39d11e 100644 --- a/pkg/sentry/platform/systrap/sysmsg/sighandler_arm64.c +++ b/pkg/sentry/platform/systrap/sysmsg/sighandler_arm64.c @@ -106,13 +106,13 @@ void __export_sighandler(int signo, siginfo_t *siginfo, void *_ucontext) { // point context. // // See: arch/arm64/include/uapi/asm/sigcontext.h - struct fpsimd_context *fpctx = &ucontext->uc_mcontext.__reserved; + const uint64_t kSigframeMagicHeaderLen = sizeof(struct _aarch64_ctx); // Verify the header. - if (fpctx->head.magic != FPSIMD_MAGIC || - __export_arch_state.fp_len != sizeof(*fpctx) - sizeof(fpctx->head)) { + if (((uint32_t *)&ucontext->uc_mcontext.__reserved)[0] != FPSIMD_MAGIC) { panic(0xbadf); } - uint8_t *fpStatePointer = (uint8_t *)&fpctx->fpsr; + uint8_t *fpStatePointer = + (uint8_t *)&ucontext->uc_mcontext.__reserved + kSigframeMagicHeaderLen; if (__export_context_decoupling_exp) { memcpy(ctx->fpstate, fpStatePointer, __export_arch_state.fp_len); } else {