implement TLS register based stack canary for ARM
v6 cover implement TLS register based stack canary for ARM
Bugzilla: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102352
In the Linux kernel, user processes calling into the kernel are essentially threads running in the same address space, of a program that never terminates. This means that using a global variable for the stack protector canary value is problematic on SMP systems, as we can never change it unless we reboot the system. (Processes that sleep for any reason will do so on a call into the kernel, which means that there will always be live kernel stack frames carrying copies of the canary taken when the function was entered)
AArch64 implements -mstack-protector-guard=sysreg for this purpose, as this permits the kernel to use different memory addresses for the stack canary for each CPU, and context switch the chosen system register with the rest of the process, allowing each process to use its own unique value for the stack canary.
This patch implements something similar, but for the 32-bit ARM kernel, which will start using the user space TLS register TPIDRURO to index per-process metadata while running in the kernel. This means we can just add an offset to TPIDRURO to obtain the address from which to load the canary value.
Changes since v5:
- rebase onto latest changes, including .c -> .cc rename
- ensure that tests execute only on targets that can support them
Changes since v4:
- add a couple of test cases
- incorporate feedback received from Qing and Kyrylo
Changes since v3:
- force a reload of the TLS register before performing the stack protector check, so that we never rely on the stack for the address of the canary
Changes since v2:
- fix the template for stack_protect_test_tls so it correctly conveys the fact that it sets the Z flag
Ard Biesheuvel (1):
[ARM] Add support for TLS register based stack protector canary access
gcc/config/arm/arm-opts.h | 6 ++ gcc/config/arm/arm-protos.h | 2 + gcc/config/arm/arm.cc | 55 +++++++++++++++ gcc/config/arm/arm.md | 71 +++++++++++++++++++- gcc/config/arm/arm.opt | 22 ++++++ gcc/doc/invoke.texi | 11 +++ gcc/testsuite/gcc.target/arm/stack-protector-7.c | 12 ++++ gcc/testsuite/gcc.target/arm/stack-protector-8.c | 7 ++ 8 files changed, 184 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.target/arm/stack-protector-7.c create mode 100644 gcc/testsuite/gcc.target/arm/stack-protector-8.c
Signature · 1 line
2.30.2
PATCH v6 1/1 Add support for TLS register based stack protector canary access
Add support for accessing the stack canary value via the TLS register, so that multiple threads running in the same address space can use distinct canary values. This is intended for the Linux kernel running in SMP mode, where processes entering the kernel are essentially threads running the same program concurrently: using a global variable for the canary in that context is problematic because it can never be rotated, and so the OS is forced to use the same value as long as it remains up.
Using the TLS register to index the stack canary helps with this, as it allows each CPU to context switch the TLS register along with the rest of the process, permitting each process to use its own value for the stack canary.
2022-01-19 Ard Biesheuvel <[email protected]>
* config/arm/arm-opts.h (enum stack_protector_guard): New
* config/arm/arm-protos.h (arm_stack_protect_tls_canary_mem):
New
* config/arm/arm.cc (TARGET_STACK_PROTECT_GUARD): Define (arm_option_override_internal): Handle and put in error checks for stack protector guard options. (arm_option_reconfigure_globals): Likewise (arm_stack_protect_tls_canary_mem): New (arm_stack_protect_guard): New
* config/arm/arm.md (stack_protect_set): New (stack_protect_set_tls): Likewise (stack_protect_test): Likewise (stack_protect_test_tls): Likewise (reload_tp_hard): Likewise
* config/arm/arm.opt (-mstack-protector-guard): New (-mstack-protector-guard-offset): New.
* doc/invoke.texi: Document new options
gcc/testsuite/ChangeLog:
* gcc.target/arm/stack-protector-7.c: New test.
* gcc.target/arm/stack-protector-8.c: New test.
--- gcc/config/arm/arm-opts.h | 6 ++ gcc/config/arm/arm-protos.h | 2 + gcc/config/arm/arm.cc | 55 +++++++++++++++ gcc/config/arm/arm.md | 71 +++++++++++++++++++- gcc/config/arm/arm.opt | 22 ++++++ gcc/doc/invoke.texi | 11 +++ gcc/testsuite/gcc.target/arm/stack-protector-7.c | 12 ++++ gcc/testsuite/gcc.target/arm/stack-protector-8.c | 7 ++ 8 files changed, 184 insertions(+), 2 deletions(-)
gcc/config/arm/arm-opts.h +6 -0
@@ -69,4 +69,10 @@ enum arm_tls_type {TLS_GNU ,TLS_GNU2 }; + +/* Where to get the canary for the stack protector. */ +enum stack_protector_guard { +SSP_TLSREG ,/* per-thread canary in TLS register */ +SSP_GLOBAL /* global canary */ +};#endif
gcc/config/arm/arm-protos.h +2 -0
@@ -195,6 +195,8 @@ extern void arm_split_atomic_op (enum rtx_code, rtx, rtx, rtx, rtx, rtx, rtx);extern rtx arm_load_tp (rtx );extern bool arm_coproc_builtin_available (enum unspecv );extern bool arm_coproc_ldc_stc_legitimate_address (rtx ); +extern rtx arm_stack_protect_tls_canary_mem (bool ); +#if definedTREE_CODE extern void arm_init_cumulative_args (CUMULATIVE_ARGS *,tree ,rtx ,tree );
gcc/config/arm/arm.cc +55 -0
85 lines not on this page · raw message
gcc/config/arm/arm.md +69 -2
95 lines not on this page · raw message
gcc/config/arm/arm.opt +22 -0
@@ -311,3 +311,25 @@ Generate code which uses the core registers only (r0-r14). mfdpic Target Mask(FDPIC) Enable Function Descriptor PIC mode. + +mstack-protector-guard= +Target RejectNegative Joined Enum(stack_protector_guard) Var(arm_stack_protector_guard) Init(SSP_GLOBAL) +Use given stack-protector guard. + +Enum +Name(stack_protector_guard) Type(enum stack_protector_guard) +Valid arguments to -mstack-protector-guard=: + +EnumValue +Enum(stack_protector_guard) String(tls) Value(SSP_TLSREG) + +EnumValue +Enum(stack_protector_guard) String(global) Value(SSP_GLOBAL) + +mstack-protector-guard-offset= +Target Joined RejectNegative String Var(arm_stack_protector_guard_offset_str) +Use an immediate to offset from the TLS register. This option is for use with +fstack-protector-guard=tls and not for use in user-land code. + +TargetVariable +long arm_stack_protector_guard_offset = 0
gcc/doc/invoke.texi +11 -0
@@ -821,6 +821,7 @@ Objective-C and Objective-C++ Dialects}. -mpure-code @gol -mcmse @gol -mfix-cmse-cve-2021-35465 @gol +-mstack-protector-guard=@var{guard} -mstack-protector-guard-offset=@var{offset} @gol -mfdpic} @emph{AVR Options}
@@ -21355,6 +21356,16 @@ enabled by default when the option @option{-mcpu=} is used with @code{cortex-m33}, @code{cortex-m35p} or @code{cortex-m55}. The option @option{-mno-fix-cmse-cve-2021-35465} can be used to disable the mitigation. +@item -mstack-protector-guard=@var{guard} +@itemx -mstack-protector-guard-offset=@var{offset} +@opindex mstack-protector-guard +@opindex mstack-protector-guard-offset +Generate stack protection code using canary at @var{guard}. Supported +locations are @samp{global} for a global canary or @samp{tls} for a +canary accessible via the TLS register. The option +@option{-mstack-protector-guard-offset=} is for use with +@option{-fstack-protector-guard=tls} and not for use in user-land code. + @item -mfdpic @itemx -mno-fdpic @opindex mfdpic
gcc/testsuite/gcc.target/arm/stack-protector-7.c new file +12 -0
@@ -0,0 +1,12 @@ +/* { dg-require-effective-target arm_hard_vfp_ok } */ +/* { dg-require-effective-target arm_arch_v7a_ok } */ +/* { dg-do compile } */ +/* { dg-options "-march=armv7-a -mfpu=vfp -fstack-protector-all -Os -mstack-protector-guard=tls -mstack-protector-guard-offset=1296 -mtp=cp15" } */ + +#include "stack-protector-5.c" + +/* See the comment in stack-protector-5.c. */ +/* { dg-final { scan-assembler-times {\tstr\t} 1 } } */ +/* Expect two TLS register accesses and two occurrences of the offset */ +/* { dg-final { scan-assembler-times {\tmrc\t} 2 } } */ +/* { dg-final { scan-assembler-times {1296} 2 } } */
gcc/testsuite/gcc.target/arm/stack-protector-8.c new file +7 -0
@@ -0,0 +1,7 @@ +/* { dg-require-effective-target arm_hard_vfp_ok } */ +/* { dg-require-effective-target arm_arch_v7a_ok } */ +/* { dg-do compile } */ +/* { dg-error "needs a hardware TLS register" "missing error when using TLS stack protector without hardware TLS register" { target *-*-* } 0 } */ +/* { dg-options "-fstack-protector-all -Os -mstack-protector-guard=tls -mtp=soft" } */ + +int foo;
Signature · 1 line
2.30.2
RE: [PATCH v6 1/1] [ARM] Add support for TLS register based stack protector canary access
Quoted 46 lines
-----Original Message-----
From: Gcc-patches <gcc-patches- [email protected]> On Behalf Of Ard Biesheuvel via Gcc-patches
Sent: Wednesday, January 19, 2022 5:44 PM
To: [email protected]
Cc: Richard Earnshaw <[email protected]>; Richard Sandiford <[email protected]>; [email protected]; Keith Packard <[email protected]>; [email protected]; Kyrylo Tkachov <[email protected]>; Ard Biesheuvel <[email protected]>
Subject: [PATCH v6 1/1] [ARM] Add support for TLS register based stack protector canary accessAdd support for accessing the stack canary value via the TLS register, so that multiple threads running in the same address space can use distinct canary values. This is intended for the Linux kernel running in SMP mode, where processes entering the kernel are essentially threads running the same program concurrently: using a global variable for the canary in that context is problematic because it can never be rotated, and so the OS is forced to use the same value as long as it remains up.
Using the TLS register to index the stack canary helps with this, as it allows each CPU to context switch the TLS register along with the rest of the process, permitting each process to use its own value for the stack canary.
2022-01-19 Ard Biesheuvel <[email protected]>
*
config/arm/arm-opts.h(enumstack_protector_guard): New
*config/arm/arm-protos.h(arm_stack_protect_tls_canary_mem):
New
* config/arm/arm.cc (TARGET_STACK_PROTECT_GUARD): Define (arm_option_override_internal): Handle and put in error checks for stack protector guard options. (arm_option_reconfigure_globals): Likewise (arm_stack_protect_tls_canary_mem): New (arm_stack_protect_guard): New
*config/arm/arm.md(stack_protect_set): New (stack_protect_set_tls): Likewise (stack_protect_test): Likewise (stack_protect_test_tls): Likewise (reload_tp_hard): Likewise
* config/arm/arm.opt (-mstack-protector-guard): New (-mstack-protector-guard-offset): New.
* doc/invoke.texi: Document new options
Quoted 6 lines
gcc/testsuite/ChangeLog:
*
gcc.target/arm/stack-protector-7.c: New test.
*gcc.target/arm/stack-protector-8.c: New test.Signed-off-by Ard Biesheuvel <[email protected]>
Thanks. One final bit. Given that you're using the Signed-off-by tag this means that you're contributing this patch under the DCO rules. Can you please confirm that you intend to contribute this patch under the rules in https://gcc.gnu.org/dco.html
If you're happy with that I'll push the patch for you.
Thanks,
Kyrill
Quoted 350 lines
--- gcc/config/arm/arm-opts.h | 6 ++ gcc/config/arm/arm-protos.h | 2 + gcc/config/arm/arm.cc | 55 +++++++++++++++ gcc/config/arm/arm.md | 71 +++++++++++++++++++- gcc/config/arm/arm.opt | 22 ++++++ gcc/doc/invoke.texi | 11 +++ gcc/testsuite/gcc.target/arm/stack-protector-7.c | 12 ++++ gcc/testsuite/gcc.target/arm/stack-protector-8.c | 7 ++ 8 files changed, 184 insertions(+), 2 deletions(-)gcc/config/arm/arm-opts.h +6
-0@@ -69,4 +69,10 @@ enum arm_tls_type {TLS_GNU ,TLS_GNU2 }; + +/* Where to get the canary for the stack protector. */ +enum stack_protector_guard { +SSP_TLSREG ,/* per-thread canary in TLS register */ +SSP_GLOBAL /* global canary */ +};#endif gcc/config/arm/arm-protos.h +2
-0@@ -195,6 +195,8 @@ extern void arm_split_atomic_op (enum rtx_code, rtx, rtx, rtx, rtx, rtx, rtx);extern rtx arm_load_tp (rtx );extern bool arm_coproc_builtin_available (enum unspecv );extern bool arm_coproc_ldc_stc_legitimate_address (rtx ); +extern rtx arm_stack_protect_tls_canary_mem (bool ); +#if definedTREE_CODE extern void
arm_init_cumulative_args(CUMULATIVE_ARGS*, tree, rtx, tree);gcc/config/arm/arm.cc +0
-0@@ -829,6 +829,9 @@ static const struct attribute_specarm_attribute_table[] =
#undef
TARGET_MD_ASM_ADJUST
#defineTARGET_MD_ASM_ADJUSTarm_md_asm_adjustgcc/config/arm/arm.cc +23
-0+ +#undef TARGET_STACK_PROTECT_GUARD +#define TARGET_STACK_PROTECT_GUARD arm_stack_protect_guard /* Obstack for minipool constant handling. */ static struct obstack minipool_obstack;@@ -3176,6 +3179,26 @@ arm_option_override_internal (struct gcc_options *opts, if (TARGET_THUMB2_P (opts->x_target_flags)) opts->x_inline_asm_unified = true; + if (arm_stack_protector_guard == SSP_GLOBAL + && opts->x_arm_stack_protector_guard_offset_str) + { + error ("incompatible options %'-mstack-protector-guard=global%' and" + "%'-mstack-protector-guard-offset=%qs%'", + arm_stack_protector_guard_offset_str); + } + + if (opts->x_arm_stack_protector_guard_offset_str) + { + char *end; + const char *str = arm_stack_protector_guard_offset_str; + errno = 0; + long offs = strtol (arm_stack_protector_guard_offset_str, &end, 0); + if (!*str || *end || errno) + error ("%qs is not a valid offset in %qs", str, + "-mstack-protector-guard-offset="); + arm_stack_protector_guard_offset = offs; + } + #ifdef SUBTARGET_OVERRIDE_INTERNAL_OPTIONS SUBTARGET_OVERRIDE_INTERNAL_OPTIONS;#endif
gcc/config/arm/arm.cc +3
-0@@ -3843,6 +3866,9 @@ arm_option_reconfigure_globals (void) else target_thread_pointer = TP_SOFT; } + + if (!TARGET_HARD_TP && arm_stack_protector_guard == SSP_TLSREG) + error("%'-mstack-protector-guard=tls%' needs a hardware TLS register"); } /* Perform some validation between the desired architecture and the rest ofthe
gcc/config/arm/arm.cc +17
-0@@ -8108,6 +8134,23 @@ legitimize_pic_address (rtx orig, machine_mode mode, rtx reg, rtx pic_reg, } +/* Generate insns that produce the address of the stack canary */ +rtx +arm_stack_protect_tls_canary_mem (bool reload) +{ + rtx tp = gen_reg_rtx (SImode); + if (reload) + emit_insn (gen_reload_tp_hard (tp)); + else + emit_insn (gen_load_tp_hard (tp)); + + rtx reg = gen_reg_rtx (SImode); + rtx offset = GEN_INT (arm_stack_protector_guard_offset); + emit_set_insn (reg, gen_rtx_PLUS (SImode, tp, offset)); + return gen_rtx_MEM (SImode, reg); +} + + /* Whether a register is callee saved or not. This is necessary because high registers are marked as caller saved when optimizing for size on Thumb-1targets despite being callee saved in order to avoid using them. */
gcc/config/arm/arm.cc +12
-0@@ -34075,6 +34118,18 @@ arm_run_selftests (void) #define TARGET_RUN_TARGET_SELFTESTS selftest::arm_run_selftests #endif /* CHECKING_P */ +/* Implement TARGET_STACK_PROTECT_GUARD. In case of a + global variable based guard use the default else + return a null tree. */ +static tree +arm_stack_protect_guard (void) +{ + if (arm_stack_protector_guard == SSP_GLOBAL) + return default_stack_protect_guard (); + + return NULL_TREE; +} + /* Worker function for TARGET_MD_ASM_ADJUST, while in thumb1 mode. Unlike the arm version, we do NOT implement asm flag outputs. */gcc/config/arm/arm.md +49
-2@@ -9183,7 +9183,7 @@ (define_expand "stack_protect_combined_set" UNSPEC_SP_SET)) (clobber (match_scratch:SI 2 "")) (clobber (match_scratch:SI 3 ""))])] - "" + "arm_stack_protector_guard == SSP_GLOBAL" "" )@@ -9267,7 +9267,7 @@ (define_expand "stack_protect_combined_test" (clobber (match_scratch:SI 3 "")) (clobber (match_scratch:SI 4 "")) (clobber (reg:CC CC_REGNUM))])] - "" + "arm_stack_protector_guard == SSP_GLOBAL" "" )@@ -9361,6 +9361,64 @@ (define_insn "arm_stack_protect_test_insn" (set_attr "arch" "t,32")] ) +(define_expand "stack_protect_set" + [(match_operand:SI 0 "memory_operand") + (match_operand:SI 1 "memory_operand")] + "arm_stack_protector_guard == SSP_TLSREG" + " +{ + operands[1] = arm_stack_protect_tls_canary_mem (false /* reload */); + emit_insn (gen_stack_protect_set_tls (operands[0], operands[1])); + DONE; +}" +) + +;; DO NOT SPLIT THIS PATTERN. It is important for security reasons that the +;; canary value does not live beyond the life of this sequence. +(define_insn "stack_protect_set_tls" + [(set (match_operand:SI 0 "memory_operand" "=m") + (unspec:SI [(match_operand:SI 1 "memory_operand" "m")] + UNSPEC_SP_SET)) + (set (match_scratch:SI 2 "=&r") (const_int 0))] + "" + "ldr\\t%2, %1\;str\\t%2, %0\;mov\t%2, #0" + [(set_attr "length" "12") + (set_attr "conds" "unconditional") + (set_attr "type" "multiple")] +) + +(define_expand "stack_protect_test" + [(match_operand:SI 0 "memory_operand") + (match_operand:SI 1 "memory_operand") + (match_operand:SI 2)] + "arm_stack_protector_guard == SSP_TLSREG" + " +{ + operands[1] = arm_stack_protect_tls_canary_mem (true /* reload */); + emit_insn (gen_stack_protect_test_tls (operands[0], operands[1])); + + rtx cc_reg = gen_rtx_REG (CC_Zmode, CC_REGNUM); + rtx eq = gen_rtx_EQ (CC_Zmode, cc_reg, const0_rtx); + emit_jump_insn (gen_arm_cond_branch (operands[2], eq, cc_reg)); + DONE; +}" +) + +(define_insn "stack_protect_test_tls" + [(set (reg:CC_Z CC_REGNUM) + (compare:CC_Z (unspec:SI [(match_operand:SI 0 "memory_operand" "m") + (match_operand:SI 1 "memory_operand""m")]
gcc/config/arm/arm.md +20
-0+ UNSPEC_SP_TEST) + (const_int 0))) + (clobber (match_scratch:SI 2 "=&r")) + (clobber (match_scratch:SI 3 "=&r"))] + "" + "ldr\t%2, %0\;ldr\t%3, %1\;eors\t%2, %3, %2\;mov\t%3, #0" + [(set_attr "length" "16") + (set_attr "conds" "set") + (set_attr "type" "multiple")] +) + (define_expand "casesi" [(match_operand:SI 0 "s_register_operand") ; index to jump on (match_operand:SI 1 "const_int_operand") ; lower bound@@ -12133,6 +12191,15 @@ (define_insn "load_tp_hard" (set_attr "type" "mrs")] ) +;; Used by the TLS register based stack protector +(define_insn "reload_tp_hard" + [(set (match_operand:SI 0 "register_operand" "=r") + (unspec_volatile:SI [(const_int 0)] VUNSPEC_MRC))] + "TARGET_HARD_TP" + "mrc\\tp15, 0, %0, c13, c0, 3\\t@ reload_tp_hard" + [(set_attr "type" "mrs")] +) + ;; Doesn't clobber R1-R3. Must use r0 for the first operand. (define_insn "load_tp_soft_fdpic" [(set (reg:SI 0) (unspec:SI [(const_int 0)] UNSPEC_TLS))gcc/config/arm/arm.opt +0
-0@@ -311,3 +311,25 @@ Generate code which uses the core registers only(r0-r14).
mfdpic
Target Mask(FDPIC)
Enable Function Descriptor PIC mode.gcc/config/arm/arm.opt +3
-0+ +mstack-protector-guard= +Target RejectNegative Joined Enum(stack_protector_guard)
Var(arm_stack_protector_guard)Init(SSP_GLOBAL)gcc/config/arm/arm.opt +14
-0+Use given stack-protector guard. + +Enum +Name(stack_protector_guard) Type(enum stack_protector_guard) +Valid arguments to -mstack-protector-guard=: + +EnumValue +Enum(stack_protector_guard) String(tls) Value(SSP_TLSREG) + +EnumValue +Enum(stack_protector_guard) String(global) Value(SSP_GLOBAL) + +mstack-protector-guard-offset= +Target Joined RejectNegative String
Var(arm_stack_protector_guard_offset_str)gcc/config/arm/arm.opt +5
-0+Use an immediate to offset from the TLS register. This option is for use with +fstack-protector-guard=tls and not for use in user-land code. + +TargetVariable +long arm_stack_protector_guard_offset = 0gcc/doc/invoke.texi +1
-0@@ -821,6 +821,7 @@ Objective-C and Objective-C++ Dialects}. -mpure-code @gol -mcmse @gol -mfix-cmse-cve-2021-35465 @gol +-mstack-protector-guard=@var{guard} -mstack-protector-guard-offset=@var{offset} @gol
-mfdpic}@emph{AVR Options}
gcc/doc/invoke.texi +0
-0@@ -21355,6 +21356,16 @@ enabled by default when the option @option{-mcpu=} is used with
@code{cortex-m33}, @code{cortex-m35p} or @code{cortex-m55}. The
option
@option{-mno-fix-cmse-cve-2021-35465} can be used to disable the
mitigation.+@item -mstack-protector-guard=@var{guard} +@itemx -mstack-protector-guard-offset=@var{offset} +@opindex mstack-protector-guard
+@opindex mstack-protector-guard-offsetgcc/doc/invoke.texi +6
-0+Generate stack protection code using canary at @var{guard}. Supported +locations are @samp{global} for a global canary or @samp{tls} for a +canary accessible via the TLS register. The option +@option{-mstack-protector-guard-offset=} is for use with +@option{-fstack-protector-guard=tls} and not for use in user-land code. + @item -mfdpic @itemx -mno-fdpic @opindex mfdpicgcc/testsuite/gcc.target/arm/stack-protector-7.c new file +4
-0@@ -0,0 +1,12 @@ +/* { dg-require-effective-target arm_hard_vfp_ok } */ +/* { dg-require-effective-target arm_arch_v7a_ok } */ +/* { dg-do compile } */ +/* { dg-options "-march=armv7-a -mfpu=vfp -fstack-protector-all -Os - mstack-protector-guard=tls -mstack-protector-guard-offset=1296 -mtp=cp15" } */
gcc/testsuite/gcc.target/arm/stack-protector-7.c new file +8
-0+ +#include "stack-protector-5.c" + +/* See the comment in stack-protector-5.c. */ +/* { dg-final { scan-assembler-times {\tstr\t} 1 } } */ +/* Expect two TLS register accesses and two occurrences of the offset */ +/* { dg-final { scan-assembler-times {\tmrc\t} 2 } } */ +/* { dg-final { scan-assembler-times {1296} 2 } } */ gcc/testsuite/gcc.target/arm/stack-protector-8.c new file +4
-0@@ -0,0 +1,7 @@ +/* { dg-require-effective-target arm_hard_vfp_ok } */ +/* { dg-require-effective-target arm_arch_v7a_ok } */ +/* { dg-do compile } */ +/* { dg-error "needs a hardware TLS register" "missing error when using TLS stack protector without hardware TLS register" { target *-*-* } 0 } */ +/* { dg-options "-fstack-protector-all -Os -mstack-protector-guard=tls - mtp=soft" } */
gcc/testsuite/gcc.target/arm/stack-protector-8.c new file +2
-1+ +int foo; --2.30.2
Re: [PATCH v6 1/1] [ARM] Add support for TLS register based stack protector canary access
Quoted 49 lines · Kyrylo Tkachov
Quoted 49 lines
-----Original Message-----
From: Gcc-patches <gcc-patches- [email protected]> On Behalf Of Ard Biesheuvel via Gcc-patches
Sent: Wednesday, January 19, 2022 5:44 PM
To: [email protected]
Cc: Richard Earnshaw <[email protected]>; Richard Sandiford <[email protected]>; [email protected]; Keith Packard <[email protected]>; [email protected]; Kyrylo Tkachov <[email protected]>; Ard Biesheuvel <[email protected]>
Subject: [PATCH v6 1/1] [ARM] Add support for TLS register based stack protector canary accessAdd support for accessing the stack canary value via the TLS register, so that multiple threads running in the same address space can use distinct canary values. This is intended for the Linux kernel running in SMP mode, where processes entering the kernel are essentially threads running the same program concurrently: using a global variable for the canary in that context is problematic because it can never be rotated, and so the OS is forced to use the same value as long as it remains up.
Using the TLS register to index the stack canary helps with this, as it allows each CPU to context switch the TLS register along with the rest of the process, permitting each process to use its own value for the stack canary.
2022-01-19 Ard Biesheuvel <[email protected]>
*
config/arm/arm-opts.h(enumstack_protector_guard): New
*config/arm/arm-protos.h(arm_stack_protect_tls_canary_mem):
New
* config/arm/arm.cc (TARGET_STACK_PROTECT_GUARD): Define (arm_option_override_internal): Handle and put in error checks for stack protector guard options. (arm_option_reconfigure_globals): Likewise (arm_stack_protect_tls_canary_mem): New (arm_stack_protect_guard): New
*config/arm/arm.md(stack_protect_set): New (stack_protect_set_tls): Likewise (stack_protect_test): Likewise (stack_protect_test_tls): Likewise (reload_tp_hard): Likewise
* config/arm/arm.opt (-mstack-protector-guard): New (-mstack-protector-guard-offset): New.
* doc/invoke.texi: Document new optionsgcc/testsuite/ChangeLog:
Quoted 7 lines
Quoted 4 lines
*
gcc.target/arm/stack-protector-7.c: New test.
*gcc.target/arm/stack-protector-8.c: New test.Signed-off-by Ard Biesheuvel <[email protected]>Thanks. One final bit. Given that you're using the Signed-off-by tag this means that you're contributing this patch under the DCO rules. Can you please confirm that you intend to contribute this patch under the rules in https://gcc.gnu.org/dco.html
Yes, I am making this contribution under DCO 1.1 terms.
Quoted 4 lines
If you're happy with that I'll push the patch for you. Thanks,
Kyrill
Thanks!
Quoted 351 lines
Quoted 350 lines
--- gcc/config/arm/arm-opts.h | 6 ++ gcc/config/arm/arm-protos.h | 2 + gcc/config/arm/arm.cc | 55 +++++++++++++++ gcc/config/arm/arm.md | 71 +++++++++++++++++++- gcc/config/arm/arm.opt | 22 ++++++ gcc/doc/invoke.texi | 11 +++ gcc/testsuite/gcc.target/arm/stack-protector-7.c | 12 ++++ gcc/testsuite/gcc.target/arm/stack-protector-8.c | 7 ++ 8 files changed, 184 insertions(+), 2 deletions(-)gcc/config/arm/arm-opts.h +6
-0@@ -69,4 +69,10 @@ enum arm_tls_type {TLS_GNU ,TLS_GNU2 }; + +/* Where to get the canary for the stack protector. */ +enum stack_protector_guard { +SSP_TLSREG ,/* per-thread canary in TLS register */ +SSP_GLOBAL /* global canary */ +};#endif gcc/config/arm/arm-protos.h +2
-0@@ -195,6 +195,8 @@ extern void arm_split_atomic_op (enum rtx_code, rtx, rtx, rtx, rtx, rtx, rtx);extern rtx arm_load_tp (rtx );extern bool arm_coproc_builtin_available (enum unspecv );extern bool arm_coproc_ldc_stc_legitimate_address (rtx ); +extern rtx arm_stack_protect_tls_canary_mem (bool ); +#if definedTREE_CODE extern void
arm_init_cumulative_args(CUMULATIVE_ARGS*, tree, rtx, tree);gcc/config/arm/arm.cc +0
-0@@ -829,6 +829,9 @@ static const struct attribute_specarm_attribute_table[] =
#undef
TARGET_MD_ASM_ADJUST
#defineTARGET_MD_ASM_ADJUSTarm_md_asm_adjustgcc/config/arm/arm.cc +23
-0+ +#undef TARGET_STACK_PROTECT_GUARD +#define TARGET_STACK_PROTECT_GUARD arm_stack_protect_guard /* Obstack for minipool constant handling. */ static struct obstack minipool_obstack;@@ -3176,6 +3179,26 @@ arm_option_override_internal (struct gcc_options *opts, if (TARGET_THUMB2_P (opts->x_target_flags)) opts->x_inline_asm_unified = true; + if (arm_stack_protector_guard == SSP_GLOBAL + && opts->x_arm_stack_protector_guard_offset_str) + { + error ("incompatible options %'-mstack-protector-guard=global%' and" + "%'-mstack-protector-guard-offset=%qs%'", + arm_stack_protector_guard_offset_str); + } + + if (opts->x_arm_stack_protector_guard_offset_str) + { + char *end; + const char *str = arm_stack_protector_guard_offset_str; + errno = 0; + long offs = strtol (arm_stack_protector_guard_offset_str, &end, 0); + if (!*str || *end || errno) + error ("%qs is not a valid offset in %qs", str, + "-mstack-protector-guard-offset="); + arm_stack_protector_guard_offset = offs; + } + #ifdef SUBTARGET_OVERRIDE_INTERNAL_OPTIONS SUBTARGET_OVERRIDE_INTERNAL_OPTIONS;#endif
gcc/config/arm/arm.cc +3
-0@@ -3843,6 +3866,9 @@ arm_option_reconfigure_globals (void) else target_thread_pointer = TP_SOFT; } + + if (!TARGET_HARD_TP && arm_stack_protector_guard == SSP_TLSREG) + error("%'-mstack-protector-guard=tls%' needs a hardware TLS register"); } /* Perform some validation between the desired architecture and the rest ofthe
gcc/config/arm/arm.cc +17
-0@@ -8108,6 +8134,23 @@ legitimize_pic_address (rtx orig, machine_mode mode, rtx reg, rtx pic_reg, } +/* Generate insns that produce the address of the stack canary */ +rtx +arm_stack_protect_tls_canary_mem (bool reload) +{ + rtx tp = gen_reg_rtx (SImode); + if (reload) + emit_insn (gen_reload_tp_hard (tp)); + else + emit_insn (gen_load_tp_hard (tp)); + + rtx reg = gen_reg_rtx (SImode); + rtx offset = GEN_INT (arm_stack_protector_guard_offset); + emit_set_insn (reg, gen_rtx_PLUS (SImode, tp, offset)); + return gen_rtx_MEM (SImode, reg); +} + + /* Whether a register is callee saved or not. This is necessary because high registers are marked as caller saved when optimizing for size on Thumb-1targets despite being callee saved in order to avoid using them. */
gcc/config/arm/arm.cc +12
-0@@ -34075,6 +34118,18 @@ arm_run_selftests (void) #define TARGET_RUN_TARGET_SELFTESTS selftest::arm_run_selftests #endif /* CHECKING_P */ +/* Implement TARGET_STACK_PROTECT_GUARD. In case of a + global variable based guard use the default else + return a null tree. */ +static tree +arm_stack_protect_guard (void) +{ + if (arm_stack_protector_guard == SSP_GLOBAL) + return default_stack_protect_guard (); + + return NULL_TREE; +} + /* Worker function for TARGET_MD_ASM_ADJUST, while in thumb1 mode. Unlike the arm version, we do NOT implement asm flag outputs. */gcc/config/arm/arm.md +49
-2@@ -9183,7 +9183,7 @@ (define_expand "stack_protect_combined_set" UNSPEC_SP_SET)) (clobber (match_scratch:SI 2 "")) (clobber (match_scratch:SI 3 ""))])] - "" + "arm_stack_protector_guard == SSP_GLOBAL" "" )@@ -9267,7 +9267,7 @@ (define_expand "stack_protect_combined_test" (clobber (match_scratch:SI 3 "")) (clobber (match_scratch:SI 4 "")) (clobber (reg:CC CC_REGNUM))])] - "" + "arm_stack_protector_guard == SSP_GLOBAL" "" )@@ -9361,6 +9361,64 @@ (define_insn "arm_stack_protect_test_insn" (set_attr "arch" "t,32")] ) +(define_expand "stack_protect_set" + [(match_operand:SI 0 "memory_operand") + (match_operand:SI 1 "memory_operand")] + "arm_stack_protector_guard == SSP_TLSREG" + " +{ + operands[1] = arm_stack_protect_tls_canary_mem (false /* reload */); + emit_insn (gen_stack_protect_set_tls (operands[0], operands[1])); + DONE; +}" +) + +;; DO NOT SPLIT THIS PATTERN. It is important for security reasons that the +;; canary value does not live beyond the life of this sequence. +(define_insn "stack_protect_set_tls" + [(set (match_operand:SI 0 "memory_operand" "=m") + (unspec:SI [(match_operand:SI 1 "memory_operand" "m")] + UNSPEC_SP_SET)) + (set (match_scratch:SI 2 "=&r") (const_int 0))] + "" + "ldr\\t%2, %1\;str\\t%2, %0\;mov\t%2, #0" + [(set_attr "length" "12") + (set_attr "conds" "unconditional") + (set_attr "type" "multiple")] +) + +(define_expand "stack_protect_test" + [(match_operand:SI 0 "memory_operand") + (match_operand:SI 1 "memory_operand") + (match_operand:SI 2)] + "arm_stack_protector_guard == SSP_TLSREG" + " +{ + operands[1] = arm_stack_protect_tls_canary_mem (true /* reload */); + emit_insn (gen_stack_protect_test_tls (operands[0], operands[1])); + + rtx cc_reg = gen_rtx_REG (CC_Zmode, CC_REGNUM); + rtx eq = gen_rtx_EQ (CC_Zmode, cc_reg, const0_rtx); + emit_jump_insn (gen_arm_cond_branch (operands[2], eq, cc_reg)); + DONE; +}" +) + +(define_insn "stack_protect_test_tls" + [(set (reg:CC_Z CC_REGNUM) + (compare:CC_Z (unspec:SI [(match_operand:SI 0 "memory_operand" "m") + (match_operand:SI 1 "memory_operand""m")]
gcc/config/arm/arm.md +20
-0+ UNSPEC_SP_TEST) + (const_int 0))) + (clobber (match_scratch:SI 2 "=&r")) + (clobber (match_scratch:SI 3 "=&r"))] + "" + "ldr\t%2, %0\;ldr\t%3, %1\;eors\t%2, %3, %2\;mov\t%3, #0" + [(set_attr "length" "16") + (set_attr "conds" "set") + (set_attr "type" "multiple")] +) + (define_expand "casesi" [(match_operand:SI 0 "s_register_operand") ; index to jump on (match_operand:SI 1 "const_int_operand") ; lower bound@@ -12133,6 +12191,15 @@ (define_insn "load_tp_hard" (set_attr "type" "mrs")] ) +;; Used by the TLS register based stack protector +(define_insn "reload_tp_hard" + [(set (match_operand:SI 0 "register_operand" "=r") + (unspec_volatile:SI [(const_int 0)] VUNSPEC_MRC))] + "TARGET_HARD_TP" + "mrc\\tp15, 0, %0, c13, c0, 3\\t@ reload_tp_hard" + [(set_attr "type" "mrs")] +) + ;; Doesn't clobber R1-R3. Must use r0 for the first operand. (define_insn "load_tp_soft_fdpic" [(set (reg:SI 0) (unspec:SI [(const_int 0)] UNSPEC_TLS))gcc/config/arm/arm.opt +0
-0@@ -311,3 +311,25 @@ Generate code which uses the core registers only(r0-r14).
mfdpic
Target Mask(FDPIC)
Enable Function Descriptor PIC mode.gcc/config/arm/arm.opt +3
-0+ +mstack-protector-guard= +Target RejectNegative Joined Enum(stack_protector_guard)
Var(arm_stack_protector_guard)Init(SSP_GLOBAL)gcc/config/arm/arm.opt +14
-0+Use given stack-protector guard. + +Enum +Name(stack_protector_guard) Type(enum stack_protector_guard) +Valid arguments to -mstack-protector-guard=: + +EnumValue +Enum(stack_protector_guard) String(tls) Value(SSP_TLSREG) + +EnumValue +Enum(stack_protector_guard) String(global) Value(SSP_GLOBAL) + +mstack-protector-guard-offset= +Target Joined RejectNegative String
Var(arm_stack_protector_guard_offset_str)gcc/config/arm/arm.opt +5
-0+Use an immediate to offset from the TLS register. This option is for use with +fstack-protector-guard=tls and not for use in user-land code. + +TargetVariable +long arm_stack_protector_guard_offset = 0gcc/doc/invoke.texi +1
-0@@ -821,6 +821,7 @@ Objective-C and Objective-C++ Dialects}. -mpure-code @gol -mcmse @gol -mfix-cmse-cve-2021-35465 @gol +-mstack-protector-guard=@var{guard} -mstack-protector-guard-offset=@var{offset} @gol
-mfdpic}@emph{AVR Options}
gcc/doc/invoke.texi +0
-0@@ -21355,6 +21356,16 @@ enabled by default when the option @option{-mcpu=} is used with
@code{cortex-m33}, @code{cortex-m35p} or @code{cortex-m55}. The
option
@option{-mno-fix-cmse-cve-2021-35465} can be used to disable the
mitigation.+@item -mstack-protector-guard=@var{guard} +@itemx -mstack-protector-guard-offset=@var{offset} +@opindex mstack-protector-guard
+@opindex mstack-protector-guard-offsetgcc/doc/invoke.texi +6
-0+Generate stack protection code using canary at @var{guard}. Supported +locations are @samp{global} for a global canary or @samp{tls} for a +canary accessible via the TLS register. The option +@option{-mstack-protector-guard-offset=} is for use with +@option{-fstack-protector-guard=tls} and not for use in user-land code. + @item -mfdpic @itemx -mno-fdpic @opindex mfdpicgcc/testsuite/gcc.target/arm/stack-protector-7.c new file +4
-0@@ -0,0 +1,12 @@ +/* { dg-require-effective-target arm_hard_vfp_ok } */ +/* { dg-require-effective-target arm_arch_v7a_ok } */ +/* { dg-do compile } */ +/* { dg-options "-march=armv7-a -mfpu=vfp -fstack-protector-all -Os - mstack-protector-guard=tls -mstack-protector-guard-offset=1296 -mtp=cp15" } */
gcc/testsuite/gcc.target/arm/stack-protector-7.c new file +8
-0+ +#include "stack-protector-5.c" + +/* See the comment in stack-protector-5.c. */ +/* { dg-final { scan-assembler-times {\tstr\t} 1 } } */ +/* Expect two TLS register accesses and two occurrences of the offset */ +/* { dg-final { scan-assembler-times {\tmrc\t} 2 } } */ +/* { dg-final { scan-assembler-times {1296} 2 } } */ gcc/testsuite/gcc.target/arm/stack-protector-8.c new file +4
-0@@ -0,0 +1,7 @@ +/* { dg-require-effective-target arm_hard_vfp_ok } */ +/* { dg-require-effective-target arm_arch_v7a_ok } */ +/* { dg-do compile } */ +/* { dg-error "needs a hardware TLS register" "missing error when using TLS stack protector without hardware TLS register" { target *-*-* } 0 } */ +/* { dg-options "-fstack-protector-all -Os -mstack-protector-guard=tls - mtp=soft" } */
gcc/testsuite/gcc.target/arm/stack-protector-8.c new file +2
-1+ +int foo; --2.30.2
RE: [PATCH v6 1/1] [ARM] Add support for TLS register based stack protector canary access
Quoted 75 lines
-----Original Message-----
From: Ard Biesheuvel <[email protected]>
Sent: Friday, January 21, 2022 10:50 AM
To: Kyrylo Tkachov <[email protected]>
Cc: [email protected]; Richard Earnshaw <[email protected]>; Richard Sandiford <[email protected]>; [email protected]; Keith Packard <[email protected]>; [email protected]
Subject: Re: [PATCH v6 1/1] [ARM] Add support for TLS register based stack protector canary accessQuoted 10 lines · Kyrylo Tkachov
Quoted 10 lines
-----Original Message-----
From: Gcc-patches <gcc-patches- [email protected]> On Behalf Of Ard Biesheuvel via Gcc-patches
Sent: Wednesday, January 19, 2022 5:44 PM
To: [email protected]
Cc: Richard Earnshaw <[email protected]>; Richard Sandiford <[email protected]>; [email protected]; Keith Packard <[email protected]>; [email protected]; KyryloTkachov
Quoted 37 lines
Quoted 37 lines
<[email protected]>; Ard Biesheuvel <[email protected]>
Subject: [PATCH v6 1/1] [ARM] Add support for TLS register based stack protector canary accessAdd support for accessing the stack canary value via the TLS register, so that multiple threads running in the same address space can use distinct canary values. This is intended for the Linux kernel running in SMP mode, where processes entering the kernel are essentially threads running the same program concurrently: using a global variable for the canary in that context is problematic because it can never be rotated, and so the OS is forced to use the same value as long as it remains up.
Using the TLS register to index the stack canary helps with this, as it allows each CPU to context switch the TLS register along with the rest of the process, permitting each process to use its own value for the stack canary.
2022-01-19 Ard Biesheuvel <[email protected]>
*
config/arm/arm-opts.h(enumstack_protector_guard): New
*config/arm/arm-protos.h(arm_stack_protect_tls_canary_mem):
New
* config/arm/arm.cc (TARGET_STACK_PROTECT_GUARD): Define (arm_option_override_internal): Handle and put in error checks for stack protector guard options. (arm_option_reconfigure_globals): Likewise (arm_stack_protect_tls_canary_mem): New (arm_stack_protect_guard): New
*config/arm/arm.md(stack_protect_set): New (stack_protect_set_tls): Likewise (stack_protect_test): Likewise (stack_protect_test_tls): Likewise (reload_tp_hard): Likewise
* config/arm/arm.opt (-mstack-protector-guard): New (-mstack-protector-guard-offset): New.
* doc/invoke.texi: Document new optionsQuoted 8 lines
Quoted 6 lines
gcc/testsuite/ChangeLog:
*
gcc.target/arm/stack-protector-7.c: New test.
*gcc.target/arm/stack-protector-8.c: New test.Signed-off-by Ard Biesheuvel <[email protected]>Thanks. One final bit. Given that you're using the Signed-off-by tag this
means that you're contributing this patch under the DCO rules.
Quoted 1 line
Can you please confirm that you intend to contribute this patch under the
rules in https://gcc.gnu.org/dco.html
Quoted 8 lines
Yes, I am making this contribution under DCO 1.1 terms.
Quoted 4 lines
If you're happy with that I'll push the patch for you. Thanks,
KyrillThanks!
I've now pushed it to trunk.
Thank you for your patience and responsiveness and apologies for the delay in the reviews.
Thanks,
Kyrill
Quoted 369 lines
Quoted 25 lines
Quoted 25 lines
--- gcc/config/arm/arm-opts.h | 6 ++ gcc/config/arm/arm-protos.h | 2 + gcc/config/arm/arm.cc | 55 +++++++++++++++ gcc/config/arm/arm.md | 71 +++++++++++++++++++- gcc/config/arm/arm.opt | 22 ++++++ gcc/doc/invoke.texi | 11 +++ gcc/testsuite/gcc.target/arm/stack-protector-7.c | 12 ++++ gcc/testsuite/gcc.target/arm/stack-protector-8.c | 7 ++ 8 files changed, 184 insertions(+), 2 deletions(-)gcc/config/arm/arm-opts.h +4
-0@@ -69,4 +69,10 @@ enum arm_tls_type {TLS_GNU ,TLS_GNU2 }; + +/* Where to get the canary for the stack protector. */ +enum stack_protector_guard { + SSP_TLSREG, /* per-thread canary in TLS register */Quoted 8 lines
gcc/config/arm/arm-protos.h extern void arm_split_atomic_op (enum
Quoted 8 lines
gcc/config/arm/arm-opts.h +2
-0+SSP_GLOBAL /* global canary */ +};#endif gcc/config/arm/arm-protos.h +0
-0@@ -195,6 +195,8 @@ extern void arm_split_atomic_op (enum
rtx_code,Quoted 9 lines
Quoted 9 lines
gcc/config/arm/arm-protos.h +2
-0rtx, rtx, rtx, rtx, rtx, rtx);extern rtx arm_load_tp (rtx );extern bool arm_coproc_builtin_available (enum unspecv );extern bool arm_coproc_ldc_stc_legitimate_address (rtx ); +extern rtx arm_stack_protect_tls_canary_mem (bool ); +#if definedTREE_CODE extern void
arm_init_cumulative_args(CUMULATIVE_ARGS*, tree, rtx,tree);
Quoted 22 lines
Quoted 22 lines
gcc/config/arm/arm.cc +0
-0@@ -829,6 +829,9 @@ static const struct attribute_specarm_attribute_table[] =
#undef
TARGET_MD_ASM_ADJUST
#defineTARGET_MD_ASM_ADJUSTarm_md_asm_adjustgcc/config/arm/arm.cc +3
-0+ +#undef TARGET_STACK_PROTECT_GUARD +#define TARGET_STACK_PROTECT_GUARD arm_stack_protect_guard /* Obstack for minipool constant handling. */ static struct obstack minipool_obstack;@@ -3176,6 +3179,26 @@ arm_option_override_internal (struct gcc_options *opts, if (TARGET_THUMB2_P (opts->x_target_flags)) opts->x_inline_asm_unified = true;Quoted 4 lines
gcc/config/arm/arm.cc arm_option_override_internal (struct gcc_options *opts,
Quoted 4 lines
gcc/config/arm/arm.cc +4
-0+ if (arm_stack_protector_guard == SSP_GLOBAL + && opts->x_arm_stack_protector_guard_offset_str) + { + error ("incompatible options %'-mstack-protector-guard=global%'and"
Quoted 18 lines
Quoted 18 lines
gcc/config/arm/arm.cc +16
-0+ "%'-mstack-protector-guard-offset=%qs%'", + arm_stack_protector_guard_offset_str); + } + + if (opts->x_arm_stack_protector_guard_offset_str) + { + char *end; + const char *str = arm_stack_protector_guard_offset_str; + errno = 0; + long offs = strtol (arm_stack_protector_guard_offset_str, &end, 0); + if (!*str || *end || errno) + error ("%qs is not a valid offset in %qs", str, + "-mstack-protector-guard-offset="); + arm_stack_protector_guard_offset = offs; + } + #ifdef SUBTARGET_OVERRIDE_INTERNAL_OPTIONS SUBTARGET_OVERRIDE_INTERNAL_OPTIONS;Quoted 8 lines
gcc/config/arm/arm.cc arm_option_reconfigure_globals (void) · line 3871
Quoted 8 lines
#endif
gcc/config/arm/arm.cc +3
-0@@ -3843,6 +3866,9 @@ arm_option_reconfigure_globals (void) else target_thread_pointer = TP_SOFT; } + + if (!TARGET_HARD_TP && arm_stack_protector_guard == SSP_TLSREG) + error("%'-mstack-protector-guard=tls%' needs a hardware TLSregister");
Quoted 3 lines
gcc/config/arm/arm.cc arm_option_reconfigure_globals (void) · line 3874
Quoted 3 lines
gcc/config/arm/arm.cc +0
-0} /* Perform some validation between the desired architecture and therest of
Quoted 2 lines
gcc/config/arm/arm.cc legitimize_pic_address (rtx orig,
Quoted 2 lines
the
gcc/config/arm/arm.cc +0
-0@@ -8108,6 +8134,23 @@ legitimize_pic_address (rtx orig,
machine_modeQuoted 14 lines
Quoted 14 lines
gcc/config/arm/arm.cc +10
-0mode, rtx reg, rtx pic_reg, } +/* Generate insns that produce the address of the stack canary */ +rtx +arm_stack_protect_tls_canary_mem (bool reload) +{ + rtx tp = gen_reg_rtx (SImode); + if (reload) + emit_insn (gen_reload_tp_hard (tp)); + else + emit_insn (gen_load_tp_hard (tp)); +Quoted 8 lines
gcc/config/arm/arm.cc legitimize_pic_address (rtx orig, machine_mode mode, rtx reg, rtx pic_reg,
Quoted 8 lines
gcc/config/arm/arm.cc +7
-0+ rtx reg = gen_reg_rtx (SImode); + rtx offset = GEN_INT (arm_stack_protector_guard_offset); + emit_set_insn (reg, gen_rtx_PLUS (SImode, tp, offset)); + return gen_rtx_MEM (SImode, reg); +} + + /* Whether a register is callee saved or not. This is necessary becausehigh
Quoted 1 line
gcc/config/arm/arm.cc legitimize_pic_address (rtx orig, · line 8156
Quoted 1 line
gcc/config/arm/arm.cc +0
-0registers are marked as caller saved when optimizing for size onThumb-1
Quoted 5 lines
Quoted 5 lines
targets despite being callee saved in order to avoid using them. */
gcc/config/arm/arm.cc +0
-0@@ -34075,6 +34118,18 @@ arm_run_selftests (void) #define TARGET_RUN_TARGET_SELFTESTS selftest::arm_run_selftests #endif /* CHECKING_P */Quoted 13 lines
gcc/config/arm/arm.cc arm_run_selftests (void)
Quoted 13 lines
gcc/config/arm/arm.cc +12
-0+/* Implement TARGET_STACK_PROTECT_GUARD. In case of a + global variable based guard use the default else + return a null tree. */ +static tree +arm_stack_protect_guard (void) +{ + if (arm_stack_protector_guard == SSP_GLOBAL) + return default_stack_protect_guard (); + + return NULL_TREE; +} + /* Worker function for TARGET_MD_ASM_ADJUST, while in thumb1mode.
Quoted 15 lines
Quoted 15 lines
gcc/config/arm/arm.cc +0
-0Unlike the arm version, we do NOT implement asm flag outputs. */gcc/config/arm/arm.md +1
-1@@ -9183,7 +9183,7 @@ (define_expand "stack_protect_combined_set" UNSPEC_SP_SET)) (clobber (match_scratch:SI 2 "")) (clobber (match_scratch:SI 3 ""))])] - "" + "arm_stack_protector_guard == SSP_GLOBAL" "" )Quoted 1 line
gcc/config/arm/arm.md (define_expand
Quoted 1 line
gcc/config/arm/arm.md +0
-0@@ -9267,7 +9267,7 @@ (define_expand"
stack_protect_combined_test"Quoted 12 lines
Quoted 12 lines
gcc/config/arm/arm.md +1
-1(clobber (match_scratch:SI 3 "")) (clobber (match_scratch:SI 4 "")) (clobber (reg:CC CC_REGNUM))])] - "" + "arm_stack_protector_guard == SSP_GLOBAL" "" )@@ -9361,6 +9361,64 @@ (define_insn "arm_stack_protect_test_insn" (set_attr "arch" "t,32")] )Quoted 13 lines
gcc/config/arm/arm.md (define_insn "arm_stack_protect_test_insn"
Quoted 13 lines
gcc/config/arm/arm.md +13
-0+(define_expand "stack_protect_set" + [(match_operand:SI 0 "memory_operand") + (match_operand:SI 1 "memory_operand")] + "arm_stack_protector_guard == SSP_TLSREG" + " +{ + operands[1] = arm_stack_protect_tls_canary_mem (false /* reload */); + emit_insn (gen_stack_protect_set_tls (operands[0], operands[1])); + DONE; +}" +) + +;; DO NOT SPLIT THIS PATTERN. It is important for security reasons thatthe
Quoted 63 lines
Quoted 63 lines
gcc/config/arm/arm.md +34
-0+;; canary value does not live beyond the life of this sequence. +(define_insn "stack_protect_set_tls" + [(set (match_operand:SI 0 "memory_operand" "=m") + (unspec:SI [(match_operand:SI 1 "memory_operand" "m")] + UNSPEC_SP_SET)) + (set (match_scratch:SI 2 "=&r") (const_int 0))] + "" + "ldr\\t%2, %1\;str\\t%2, %0\;mov\t%2, #0" + [(set_attr "length" "12") + (set_attr "conds" "unconditional") + (set_attr "type" "multiple")] +) + +(define_expand "stack_protect_test" + [(match_operand:SI 0 "memory_operand") + (match_operand:SI 1 "memory_operand") + (match_operand:SI 2)] + "arm_stack_protector_guard == SSP_TLSREG" + " +{ + operands[1] = arm_stack_protect_tls_canary_mem (true /* reload */); + emit_insn (gen_stack_protect_test_tls (operands[0], operands[1])); + + rtx cc_reg = gen_rtx_REG (CC_Zmode, CC_REGNUM); + rtx eq = gen_rtx_EQ (CC_Zmode, cc_reg, const0_rtx); + emit_jump_insn (gen_arm_cond_branch (operands[2], eq, cc_reg)); + DONE; +}" +) + +(define_insn "stack_protect_test_tls" + [(set (reg:CC_Z CC_REGNUM) + (compare:CC_Z (unspec:SI [(match_operand:SI 0 "memory_operand" "m") + (match_operand:SI 1 "memory_operand""m")]
gcc/config/arm/arm.md +20
-0+ UNSPEC_SP_TEST) + (const_int 0))) + (clobber (match_scratch:SI 2 "=&r")) + (clobber (match_scratch:SI 3 "=&r"))] + "" + "ldr\t%2, %0\;ldr\t%3, %1\;eors\t%2, %3, %2\;mov\t%3, #0" + [(set_attr "length" "16") + (set_attr "conds" "set") + (set_attr "type" "multiple")] +) + (define_expand "casesi" [(match_operand:SI 0 "s_register_operand") ; index to jump on (match_operand:SI 1 "const_int_operand") ; lower bound@@ -12133,6 +12191,15 @@ (define_insn "load_tp_hard" (set_attr "type" "mrs")] ) +;; Used by the TLS register based stack protector +(define_insn "reload_tp_hard" + [(set (match_operand:SI 0 "register_operand" "=r") + (unspec_volatile:SI [(const_int 0)] VUNSPEC_MRC))] + "TARGET_HARD_TP" + "mrc\\tp15, 0, %0, c13, c0, 3\\t@ reload_tp_hard" + [(set_attr "type" "mrs")] +) +Quoted 8 lines
gcc/config/arm/arm.opt Generate code which uses the core registers
Quoted 8 lines
gcc/config/arm/arm.md +0
-0;; Doesn't clobber R1-R3. Must use r0 for the first operand. (define_insn "load_tp_soft_fdpic" [(set (reg:SI 0) (unspec:SI [(const_int 0)] UNSPEC_TLS))gcc/config/arm/arm.opt +0
-0@@ -311,3 +311,25 @@ Generate code which uses the core registersonly
Quoted 16 lines
Quoted 16 lines
(r0-r14).
mfdpic
Target Mask(FDPIC)
Enable Function Descriptor PIC mode.gcc/config/arm/arm.opt +3
-0+ +mstack-protector-guard= +Target RejectNegative Joined Enum(stack_protector_guard)
Var(arm_stack_protector_guard)Init(SSP_GLOBAL)gcc/config/arm/arm.opt +8
-0+Use given stack-protector guard. + +Enum +Name(stack_protector_guard) Type(enum stack_protector_guard) +Valid arguments to -mstack-protector-guard=: + +EnumValue +Enum(stack_protector_guard) String(tls) Value(SSP_TLSREG)Quoted 8 lines
Quoted 8 lines
gcc/config/arm/arm.opt +6
-0+ +EnumValue +Enum(stack_protector_guard) String(global) Value(SSP_GLOBAL) + +mstack-protector-guard-offset= +Target Joined RejectNegative String
Var(arm_stack_protector_guard_offset_str)
+Use an immediate to offset from the TLS register. This option is for usewith
Quoted 16 lines
Quoted 16 lines
gcc/config/arm/arm.opt +4
-0+fstack-protector-guard=tls and not for use in user-land code. + +TargetVariable +long arm_stack_protector_guard_offset = 0gcc/doc/invoke.texi +1
-0@@ -821,6 +821,7 @@ Objective-C and Objective-C++ Dialects}. -mpure-code @gol -mcmse @gol -mfix-cmse-cve-2021-35465 @gol +-mstack-protector-guard=@var{guard} -mstack-protector-guard-offset=@var{offset} @gol
-mfdpic}Quoted 2 lines
gcc/doc/invoke.texi enabled by default when the option
Quoted 2 lines
@emph{AVR Options}
gcc/doc/invoke.texi +0
-0@@ -21355,6 +21356,16 @@ enabled by default when the option@option{-
Quoted 23 lines
Quoted 23 lines
mcpu=} is used with
@code{cortex-m33}, @code{cortex-m35p} or @code{cortex-m55}. The
option
@option{-mno-fix-cmse-cve-2021-35465} can be used to disable the
mitigation.+@item -mstack-protector-guard=@var{guard} +@itemx -mstack-protector-guard-offset=@var{offset} +@opindex mstack-protector-guard
+@opindex mstack-protector-guard-offsetgcc/doc/invoke.texi +6
-0+Generate stack protection code using canary at @var{guard}. Supported +locations are @samp{global} for a global canary or @samp{tls} for a +canary accessible via the TLS register. The option +@option{-mstack-protector-guard-offset=} is for use with +@option{-fstack-protector-guard=tls} and not for use in user-land code. + @item -mfdpic @itemx -mno-fdpic @opindex mfdpicgcc/testsuite/gcc.target/arm/stack-protector-7.c new file +0
-0Quoted 8 lines
Quoted 8 lines
gcc/testsuite/gcc.target/arm/stack-protector-7.c new file +4
-0@@ -0,0 +1,12 @@ +/* { dg-require-effective-target arm_hard_vfp_ok } */ +/* { dg-require-effective-target arm_arch_v7a_ok } */ +/* { dg-do compile } */ +/* { dg-options "-march=armv7-a -mfpu=vfp -fstack-protector-all -Os - mstack-protector-guard=tls -mstack-protector-guard-offset=1296 -
mtp=cp15"
Quoted 12 lines
Quoted 12 lines
} */
gcc/testsuite/gcc.target/arm/stack-protector-7.c new file +8
-0+ +#include "stack-protector-5.c" + +/* See the comment in stack-protector-5.c. */ +/* { dg-final { scan-assembler-times {\tstr\t} 1 } } */ +/* Expect two TLS register accesses and two occurrences of the offset */ +/* { dg-final { scan-assembler-times {\tmrc\t} 2 } } */ +/* { dg-final { scan-assembler-times {1296} 2 } } */ gcc/testsuite/gcc.target/arm/stack-protector-8.c new file +0
-0Quoted 8 lines
gcc/testsuite/gcc.target/arm/stack-protector-8.c line 4
Quoted 8 lines
index 000000000000..ea5ef3211678
gcc/testsuite/gcc.target/arm/stack-protector-8.c new file +4
-0@@ -0,0 +1,7 @@ +/* { dg-require-effective-target arm_hard_vfp_ok } */ +/* { dg-require-effective-target arm_arch_v7a_ok } */ +/* { dg-do compile } */ +/* { dg-error "needs a hardware TLS register" "missing error when using TLS
Quoted 8 lines
Quoted 7 lines
stack protector without hardware TLS register" { target *-*-* } 0 } */ +/* { dg-options "-fstack-protector-all -Os -mstack-protector-guard=tls - mtp=soft" } */
gcc/testsuite/gcc.target/arm/stack-protector-8.c new file +2
-1+ +int foo; --2.30.2