aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel
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/kernel
parentarm64: enable pointer authentication (diff)
downloadlinux-dev-84931327a807a4dd65d0d6b53a8ae47845c91f79.tar.xz
linux-dev-84931327a807a4dd65d0d6b53a8ae47845c91f79.zip
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/kernel')
-rw-r--r--arch/arm64/kernel/pointer_auth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/pointer_auth.c b/arch/arm64/kernel/pointer_auth.c
index b9f6f5f3409a..c507b584259d 100644
--- a/arch/arm64/kernel/pointer_auth.c
+++ b/arch/arm64/kernel/pointer_auth.c
@@ -9,7 +9,7 @@
int ptrauth_prctl_reset_keys(struct task_struct *tsk, unsigned long arg)
{
- struct ptrauth_keys *keys = &tsk->thread_info.keys_user;
+ struct ptrauth_keys *keys = &tsk->thread.keys_user;
unsigned long addr_key_mask = PR_PAC_APIAKEY | PR_PAC_APIBKEY |
PR_PAC_APDAKEY | PR_PAC_APDBKEY;
unsigned long key_mask = addr_key_mask | PR_PAC_APGAKEY;