summaryrefslogtreecommitdiffstats
path: root/arch/arm64/include/asm/processor.h
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2018-12-13 13:14:06 +0000
committerWill Deacon <will.deacon@arm.com>2018-12-13 16:42:47 +0000
commit84931327a807a4dd65d0d6b53a8ae47845c91f79 (patch)
treef759292fbe46dd83d4b3954eb17eb53bfe480d7f /arch/arm64/include/asm/processor.h
parent04ca3204fa09f5f55c8f113b0072004a7b364ff4 (diff)
downloadlinux-84931327a807a4dd65d0d6b53a8ae47845c91f79.tar.bz2
arm64: ptr auth: Move per-thread keys from thread_info to thread_struct
We don't need to get at the per-thread keys from assembly at all, so they can live alongside the rest of the per-thread register state in thread_struct instead of thread_info. This will also allow straighforward whitelisting of the keys for hardened usercopy should we expose them via a ptrace request later on. Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/include/asm/processor.h')
-rw-r--r--arch/arm64/include/asm/processor.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h
index 142c708cb429..f1a7ab18faf3 100644
--- a/arch/arm64/include/asm/processor.h
+++ b/arch/arm64/include/asm/processor.h
@@ -147,6 +147,9 @@ struct thread_struct {
unsigned long fault_address; /* fault info */
unsigned long fault_code; /* ESR_EL1 value */
struct debug_info debug; /* debugging */
+#ifdef CONFIG_ARM64_PTR_AUTH
+ struct ptrauth_keys keys_user;
+#endif
};
static inline void arch_thread_struct_whitelist(unsigned long *offset,