summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/paca.h
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@c-s.fr>2018-09-27 09:05:55 +0200
committerMichael Ellerman <mpe@ellerman.id.au>2018-10-03 07:40:03 +0200
commit06ec27aea9fc84d9c6d879eb64b5bcf28a8a1eb7 (patch)
tree74bcc3ec9f8ea5647aead31b19d287f720fd0ab5 /arch/powerpc/include/asm/paca.h
parentpowerpc/32: add stack protector support (diff)
downloadlinux-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/paca.h')
-rw-r--r--arch/powerpc/include/asm/paca.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h
index 7b6e23af3808..c6d01f0aa898 100644
--- a/arch/powerpc/include/asm/paca.h
+++ b/arch/powerpc/include/asm/paca.h
@@ -256,6 +256,9 @@ struct paca_struct {
struct slb_entry *mce_faulty_slbs;
u16 slb_save_cache_ptr;
#endif /* CONFIG_PPC_BOOK3S_64 */
+#ifdef CONFIG_STACKPROTECTOR
+ unsigned long canary;
+#endif
} ____cacheline_aligned;
extern void copy_mm_to_paca(struct mm_struct *mm);