public inbox for newlib-cvs@sourceware.org help / color / mirror / Atom feed
From: Richard Earnshaw <rearnsha@sourceware.org> To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: libc: setjmp M-profile PACBTI-enablement Date: Tue, 10 Jan 2023 16:49:55 +0000 (GMT) [thread overview] Message-ID: <20230110164955.2C52A385B526@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=31e5ce10db46bf8c15d78b2546553db45eb33141 commit 31e5ce10db46bf8c15d78b2546553db45eb33141 Author: Victor L. Do Nascimento <victor.donascimento@arm.com> Date: Tue Jan 10 14:02:08 2023 +0000 newlib: libc: setjmp M-profile PACBTI-enablement Add function prologue/epilogue to conditionally add BTI landing pads and/or PAC code generation & authentication instructions depending on compilation flags. Save the PAC value in the jump buffer so that longjmp can only return to the authenticated location. Diff: --- newlib/libc/machine/arm/setjmp.S | 43 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/newlib/libc/machine/arm/setjmp.S b/newlib/libc/machine/arm/setjmp.S index d814afea8..5213c063b 100644 --- a/newlib/libc/machine/arm/setjmp.S +++ b/newlib/libc/machine/arm/setjmp.S @@ -22,6 +22,11 @@ #define SIZE(x) #endif +/* Jump buffer allocation sizes. */ +#define JUMPBUF_CORE_REGS_SIZE (10 * 4) +#define JUMPBUF_FP_REGS_SIZE (8 * 8) +#define JUMPBUF_PAC (JUMPBUF_CORE_REGS_SIZE + JUMPBUF_FP_REGS_SIZE + 0) + /* Arm/Thumb interworking support: The interworking scheme expects functions to use a BX instruction @@ -155,6 +160,8 @@ SYM (.arm_start_of.\name): .align 2 MODE .globl SYM (\name) + .fnstart + .cfi_startproc TYPE (\name) SYM (\name): PROLOGUE \name @@ -162,6 +169,8 @@ SYM (\name): .macro FUNC_END name RET + .cfi_endproc + .fnend SIZE (\name) .endm @@ -171,6 +180,21 @@ SYM (\name): FUNC_START setjmp +#if __ARM_FEATURE_PAC_DEFAULT +# if __ARM_FEATURE_BTI_DEFAULT + pacbti ip, lr, sp +# else + pac ip, lr, sp +# endif /* __ARM_FEATURE_BTI_DEFAULT */ + mov r3, ip + str r3, [r0, #JUMPBUF_PAC] + .cfi_register 143, 12 +#else +# if __ARM_FEATURE_BTI_DEFAULT + bti +# endif /* __ARM_FEATURE_BTI_DEFAULT */ +#endif /* __ARM_FEATURE_PAC_DEFAULT */ + /* Save all the callee-preserved registers into the jump buffer. */ #ifdef __thumb2__ mov ip, sp @@ -184,6 +208,10 @@ SYM (\name): /* When setting up the jump buffer return 0. */ mov r0, #0 +#if __ARM_FEATURE_PAC_DEFAULT + mov ip, r3 + aut ip, lr, sp +#endif /* __ARM_FEATURE_PAC_DEFAULT */ FUNC_END setjmp @@ -193,6 +221,16 @@ SYM (\name): FUNC_START longjmp +#if __ARM_FEATURE_BTI_DEFAULT + bti +#endif /* __ARM_FEATURE_BTI_DEFAULT */ + +#if __ARM_FEATURE_PAC_DEFAULT + /* Keep original jmpbuf address for retrieving pac-code + for authentication. */ + mov r2, r0 +#endif /* __ARM_FEATURE_PAC_DEFAULT */ + /* If we have stack extension code it ought to be handled here. */ /* Restore the registers, retrieving the state when setjmp() was called. */ @@ -212,5 +250,10 @@ SYM (\name): it eq moveq r0, #1 +#if __ARM_FEATURE_PAC_DEFAULT + ldr ip, [r2, #JUMPBUF_PAC] + aut ip, lr, sp +#endif /* __ARM_FEATURE_PAC_DEFAULT */ + FUNC_END longjmp #endif
reply other threads:[~2023-01-10 16:49 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230110164955.2C52A385B526@sourceware.org \ --to=rearnsha@sourceware.org \ --cc=newlib-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).