diff options
| author | Christophe Leroy <christophe.leroy@c-s.fr> | 2018-09-27 09:05:55 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-10-03 07:40:03 +0200 |
| commit | 06ec27aea9fc84d9c6d879eb64b5bcf28a8a1eb7 (patch) | |
| tree | 74bcc3ec9f8ea5647aead31b19d287f720fd0ab5 /arch/powerpc/include/asm/stackprotector.h | |
| parent | powerpc/32: add stack protector support (diff) | |
| download | linux-06ec27aea9fc84d9c6d879eb64b5bcf28a8a1eb7.tar.xz linux-06ec27aea9fc84d9c6d879eb64b5bcf28a8a1eb7.zip | |
powerpc/64: add stack protector support
On PPC64, as register r13 points to the paca_struct at all time,
this patch adds a copy of the canary there, which is copied at
task_switch.
That new canary is then used by using the following GCC options:
-mstack-protector-guard=tls
-mstack-protector-guard-reg=r13
-mstack-protector-guard-offset=offsetof(struct paca_struct, canary))
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/include/asm/stackprotector.h')
| -rw-r--r-- | arch/powerpc/include/asm/stackprotector.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/stackprotector.h b/arch/powerpc/include/asm/stackprotector.h index d05d969c98c2..1c8460e23583 100644 --- a/arch/powerpc/include/asm/stackprotector.h +++ b/arch/powerpc/include/asm/stackprotector.h @@ -11,6 +11,7 @@ #include <linux/version.h> #include <asm/reg.h> #include <asm/current.h> +#include <asm/paca.h> /* * Initialize the stackprotector canary value. @@ -29,6 +30,9 @@ static __always_inline void boot_init_stack_canary(void) canary &= CANARY_MASK; current->stack_canary = canary; +#ifdef CONFIG_PPC64 + get_paca()->canary = canary; +#endif } #endif /* _ASM_STACKPROTECTOR_H */ |