diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2018-12-12 15:08:44 +0300 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-12-12 21:45:31 +0300 |
| commit | 0a1213fa7432778b71a1c0166bf56660a3aab030 (patch) | |
| tree | ddf7b68d14a504fe97fbdefe00bf8a3296590cc5 /arch/arm64/kernel/asm-offsets.c | |
| parent | 4ab215061554ae2a4b78744a5dd3b3c6639f16a7 (diff) | |
| download | linux-0a1213fa7432778b71a1c0166bf56660a3aab030.tar.xz | |
arm64: enable per-task stack canaries
This enables the use of per-task stack canary values if GCC has
support for emitting the stack canary reference relative to the
value of sp_el0, which holds the task struct pointer in the arm64
kernel.
The $(eval) extends KBUILD_CFLAGS at the moment the make rule is
applied, which means asm-offsets.o (which we rely on for the offset
value) is built without the arguments, and everything built afterwards
has the options set.
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/asm-offsets.c')
| -rw-r--r-- | arch/arm64/kernel/asm-offsets.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c index 323aeb5f2fe6..65b8afc84466 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -46,6 +46,9 @@ int main(void) DEFINE(TSK_TI_TTBR0, offsetof(struct task_struct, thread_info.ttbr0)); #endif DEFINE(TSK_STACK, offsetof(struct task_struct, stack)); +#ifdef CONFIG_STACKPROTECTOR + DEFINE(TSK_STACK_CANARY, offsetof(struct task_struct, stack_canary)); +#endif BLANK(); DEFINE(THREAD_CPU_CONTEXT, offsetof(struct task_struct, thread.cpu_context)); BLANK(); |