From: Vincenzo Frascino <vincenzo.frascino@arm.com>
To: Amit Daniel Kachhap <amit.kachhap@arm.com>,
linux-arm-kernel@lists.infradead.org
Cc: Mark Rutland <mark.rutland@arm.com>,
Kees Cook <keescook@chromium.org>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Kristina Martsenko <kristina.martsenko@arm.com>,
Dave Martin <Dave.Martin@arm.com>,
Mark Brown <broonie@kernel.org>,
James Morse <james.morse@arm.com>,
Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>,
Will Deacon <will@kernel.org>, Ard Biesheuvel <ardb@kernel.org>
Subject: Re: [PATCH v6 03/18] arm64: rename ptrauth key structures to be user-specific
Date: Tue, 10 Mar 2020 11:35:53 +0000 [thread overview]
Message-ID: <1dca26b3-0df1-f4cc-d32c-1eee4c474e9a@arm.com> (raw)
In-Reply-To: <1583476525-13505-4-git-send-email-amit.kachhap@arm.com>
On 3/6/20 6:35 AM, Amit Daniel Kachhap wrote:
> From: Kristina Martsenko <kristina.martsenko@arm.com>
>
> We currently enable ptrauth for userspace, but do not use it within the
> kernel. We're going to enable it for the kernel, and will need to manage
> a separate set of ptrauth keys for the kernel.
>
> We currently keep all 5 keys in struct ptrauth_keys. However, as the
> kernel will only need to use 1 key, it is a bit wasteful to allocate a
> whole ptrauth_keys struct for every thread.
>
> Therefore, a subsequent patch will define a separate struct, with only 1
> key, for the kernel. In preparation for that, rename the existing struct
> (and associated macros and functions) to reflect that they are specific
> to userspace.
>
Reviewed-by: Vincenzo Frascino <Vincenzo.Frascino@arm.com>
> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
> Signed-off-by: Kristina Martsenko <kristina.martsenko@arm.com>
> [Amit: Re-positioned the patch to reduce the diff]
> Signed-off-by: Amit Daniel Kachhap <amit.kachhap@arm.com>
> ---
> arch/arm64/include/asm/pointer_auth.h | 12 ++++++------
> arch/arm64/include/asm/processor.h | 2 +-
> arch/arm64/kernel/pointer_auth.c | 8 ++++----
> arch/arm64/kernel/ptrace.c | 16 ++++++++--------
> 4 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/arch/arm64/include/asm/pointer_auth.h b/arch/arm64/include/asm/pointer_auth.h
> index 7a24bad..799b079 100644
> --- a/arch/arm64/include/asm/pointer_auth.h
> +++ b/arch/arm64/include/asm/pointer_auth.h
> @@ -22,7 +22,7 @@ struct ptrauth_key {
> * We give each process its own keys, which are shared by all threads. The keys
> * are inherited upon fork(), and reinitialised upon exec*().
> */
> -struct ptrauth_keys {
> +struct ptrauth_keys_user {
> struct ptrauth_key apia;
> struct ptrauth_key apib;
> struct ptrauth_key apda;
> @@ -30,7 +30,7 @@ struct ptrauth_keys {
> struct ptrauth_key apga;
> };
>
> -static inline void ptrauth_keys_init(struct ptrauth_keys *keys)
> +static inline void ptrauth_keys_init_user(struct ptrauth_keys_user *keys)
> {
> if (system_supports_address_auth()) {
> get_random_bytes(&keys->apia, sizeof(keys->apia));
> @@ -50,7 +50,7 @@ do { \
> write_sysreg_s(__pki_v.hi, SYS_ ## k ## KEYHI_EL1); \
> } while (0)
>
> -static inline void ptrauth_keys_switch(struct ptrauth_keys *keys)
> +static inline void ptrauth_keys_switch_user(struct ptrauth_keys_user *keys)
> {
> if (system_supports_address_auth()) {
> __ptrauth_key_install(APIA, keys->apia);
> @@ -80,12 +80,12 @@ static inline unsigned long ptrauth_strip_insn_pac(unsigned long ptr)
> #define ptrauth_thread_init_user(tsk) \
> do { \
> struct task_struct *__ptiu_tsk = (tsk); \
> - ptrauth_keys_init(&__ptiu_tsk->thread.keys_user); \
> - ptrauth_keys_switch(&__ptiu_tsk->thread.keys_user); \
> + ptrauth_keys_init_user(&__ptiu_tsk->thread.keys_user); \
> + ptrauth_keys_switch_user(&__ptiu_tsk->thread.keys_user); \
> } while (0)
>
> #define ptrauth_thread_switch(tsk) \
> - ptrauth_keys_switch(&(tsk)->thread.keys_user)
> + ptrauth_keys_switch_user(&(tsk)->thread.keys_user)
>
> #else /* CONFIG_ARM64_PTR_AUTH */
> #define ptrauth_prctl_reset_keys(tsk, arg) (-EINVAL)
> diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h
> index 5ba6320..496a928 100644
> --- a/arch/arm64/include/asm/processor.h
> +++ b/arch/arm64/include/asm/processor.h
> @@ -146,7 +146,7 @@ struct thread_struct {
> unsigned long fault_code; /* ESR_EL1 value */
> struct debug_info debug; /* debugging */
> #ifdef CONFIG_ARM64_PTR_AUTH
> - struct ptrauth_keys keys_user;
> + struct ptrauth_keys_user keys_user;
> #endif
> };
>
> diff --git a/arch/arm64/kernel/pointer_auth.c b/arch/arm64/kernel/pointer_auth.c
> index c507b58..af5a638 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.keys_user;
> + struct ptrauth_keys_user *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;
> @@ -18,8 +18,8 @@ int ptrauth_prctl_reset_keys(struct task_struct *tsk, unsigned long arg)
> return -EINVAL;
>
> if (!arg) {
> - ptrauth_keys_init(keys);
> - ptrauth_keys_switch(keys);
> + ptrauth_keys_init_user(keys);
> + ptrauth_keys_switch_user(keys);
> return 0;
> }
>
> @@ -41,7 +41,7 @@ int ptrauth_prctl_reset_keys(struct task_struct *tsk, unsigned long arg)
> if (arg & PR_PAC_APGAKEY)
> get_random_bytes(&keys->apga, sizeof(keys->apga));
>
> - ptrauth_keys_switch(keys);
> + ptrauth_keys_switch_user(keys);
>
> return 0;
> }
> diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c
> index cd6e5fa..b3d3005 100644
> --- a/arch/arm64/kernel/ptrace.c
> +++ b/arch/arm64/kernel/ptrace.c
> @@ -999,7 +999,7 @@ static struct ptrauth_key pac_key_from_user(__uint128_t ukey)
> }
>
> static void pac_address_keys_to_user(struct user_pac_address_keys *ukeys,
> - const struct ptrauth_keys *keys)
> + const struct ptrauth_keys_user *keys)
> {
> ukeys->apiakey = pac_key_to_user(&keys->apia);
> ukeys->apibkey = pac_key_to_user(&keys->apib);
> @@ -1007,7 +1007,7 @@ static void pac_address_keys_to_user(struct user_pac_address_keys *ukeys,
> ukeys->apdbkey = pac_key_to_user(&keys->apdb);
> }
>
> -static void pac_address_keys_from_user(struct ptrauth_keys *keys,
> +static void pac_address_keys_from_user(struct ptrauth_keys_user *keys,
> const struct user_pac_address_keys *ukeys)
> {
> keys->apia = pac_key_from_user(ukeys->apiakey);
> @@ -1021,7 +1021,7 @@ static int pac_address_keys_get(struct task_struct *target,
> unsigned int pos, unsigned int count,
> void *kbuf, void __user *ubuf)
> {
> - struct ptrauth_keys *keys = &target->thread.keys_user;
> + struct ptrauth_keys_user *keys = &target->thread.keys_user;
> struct user_pac_address_keys user_keys;
>
> if (!system_supports_address_auth())
> @@ -1038,7 +1038,7 @@ static int pac_address_keys_set(struct task_struct *target,
> unsigned int pos, unsigned int count,
> const void *kbuf, const void __user *ubuf)
> {
> - struct ptrauth_keys *keys = &target->thread.keys_user;
> + struct ptrauth_keys_user *keys = &target->thread.keys_user;
> struct user_pac_address_keys user_keys;
> int ret;
>
> @@ -1056,12 +1056,12 @@ static int pac_address_keys_set(struct task_struct *target,
> }
>
> static void pac_generic_keys_to_user(struct user_pac_generic_keys *ukeys,
> - const struct ptrauth_keys *keys)
> + const struct ptrauth_keys_user *keys)
> {
> ukeys->apgakey = pac_key_to_user(&keys->apga);
> }
>
> -static void pac_generic_keys_from_user(struct ptrauth_keys *keys,
> +static void pac_generic_keys_from_user(struct ptrauth_keys_user *keys,
> const struct user_pac_generic_keys *ukeys)
> {
> keys->apga = pac_key_from_user(ukeys->apgakey);
> @@ -1072,7 +1072,7 @@ static int pac_generic_keys_get(struct task_struct *target,
> unsigned int pos, unsigned int count,
> void *kbuf, void __user *ubuf)
> {
> - struct ptrauth_keys *keys = &target->thread.keys_user;
> + struct ptrauth_keys_user *keys = &target->thread.keys_user;
> struct user_pac_generic_keys user_keys;
>
> if (!system_supports_generic_auth())
> @@ -1089,7 +1089,7 @@ static int pac_generic_keys_set(struct task_struct *target,
> unsigned int pos, unsigned int count,
> const void *kbuf, const void __user *ubuf)
> {
> - struct ptrauth_keys *keys = &target->thread.keys_user;
> + struct ptrauth_keys_user *keys = &target->thread.keys_user;
> struct user_pac_generic_keys user_keys;
> int ret;
>
>
--
Regards,
Vincenzo
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-03-10 11:35 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-06 6:35 [PATCH v6 00/18] arm64: return address signing Amit Daniel Kachhap
2020-03-06 6:35 ` [PATCH v6 01/18] arm64: cpufeature: Fix meta-capability cpufeature check Amit Daniel Kachhap
2020-03-10 10:59 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 02/18] arm64: cpufeature: add pointer auth meta-capabilities Amit Daniel Kachhap
2020-03-10 11:18 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 03/18] arm64: rename ptrauth key structures to be user-specific Amit Daniel Kachhap
2020-03-10 11:35 ` Vincenzo Frascino [this message]
2020-03-06 6:35 ` [PATCH v6 04/18] arm64: install user ptrauth keys at kernel exit time Amit Daniel Kachhap
2020-03-06 19:07 ` James Morse
2020-03-10 11:48 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 05/18] arm64: create macro to park cpu in an infinite loop Amit Daniel Kachhap
2020-03-10 12:02 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 06/18] arm64: ptrauth: Add bootup/runtime flags for __cpu_setup Amit Daniel Kachhap
2020-03-06 19:07 ` James Morse
2020-03-09 17:04 ` Catalin Marinas
2020-03-10 12:14 ` Vincenzo Frascino
2020-03-11 9:28 ` Amit Kachhap
2020-03-06 6:35 ` [PATCH v6 07/18] arm64: cpufeature: Move cpu capability helpers inside C file Amit Daniel Kachhap
2020-03-10 12:20 ` Vincenzo Frascino
2020-03-10 12:53 ` Amit Kachhap
2020-03-11 10:50 ` Catalin Marinas
2020-03-11 11:44 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 08/18] arm64: cpufeature: handle conflicts based on capability Amit Daniel Kachhap
2020-03-10 12:31 ` Vincenzo Frascino
2020-03-11 11:03 ` Catalin Marinas
2020-03-11 11:46 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 09/18] arm64: enable ptrauth earlier Amit Daniel Kachhap
2020-03-10 15:45 ` Vincenzo Frascino
2020-03-11 6:26 ` Amit Kachhap
2020-03-11 10:26 ` Vincenzo Frascino
2020-03-11 10:46 ` Amit Kachhap
2020-03-11 10:49 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 10/18] arm64: initialize and switch ptrauth kernel keys Amit Daniel Kachhap
2020-03-10 15:07 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 11/18] arm64: initialize ptrauth keys for kernel booting task Amit Daniel Kachhap
2020-03-10 15:09 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 12/18] arm64: mask PAC bits of __builtin_return_address Amit Daniel Kachhap
2020-03-06 19:07 ` James Morse
2020-03-09 12:27 ` Amit Kachhap
2020-03-06 6:35 ` [PATCH v6 13/18] arm64: unwind: strip PAC from kernel addresses Amit Daniel Kachhap
2020-03-09 19:03 ` James Morse
2020-03-10 12:28 ` Amit Kachhap
2020-03-10 17:37 ` James Morse
2020-03-11 6:07 ` Amit Kachhap
2020-03-11 9:09 ` James Morse
2020-03-06 6:35 ` [PATCH v6 14/18] arm64: __show_regs: strip PAC from lr in printk Amit Daniel Kachhap
2020-03-10 15:11 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 15/18] arm64: suspend: restore the kernel ptrauth keys Amit Daniel Kachhap
2020-03-10 15:18 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 16/18] kconfig: Add support for 'as-option' Amit Daniel Kachhap
2020-03-06 11:37 ` Masahiro Yamada
2020-03-06 11:49 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 17/18] arm64: compile the kernel with ptrauth return address signing Amit Daniel Kachhap
2020-03-10 15:20 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 18/18] lkdtm: arm64: test kernel pointer authentication Amit Daniel Kachhap
2020-03-10 15:59 ` [PATCH v6 00/18] arm64: return address signing Rémi Denis-Courmont
2020-03-11 9:28 ` James Morse
2020-03-12 6:53 ` Amit Kachhap
2020-03-12 8:06 ` Amit Kachhap
2020-03-12 12:47 ` [PATCH v6 00/18] (as long a Marc Zyngier
2020-03-12 13:21 ` Amit Kachhap
2020-03-12 15:05 ` [PATCH v6 00/18] arm64: return address signing Marc Zyngier
2020-03-12 17:26 ` James Morse
2020-03-12 17:31 ` Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1dca26b3-0df1-f4cc-d32c-1eee4c474e9a@arm.com \
--to=vincenzo.frascino@arm.com \
--cc=Dave.Martin@arm.com \
--cc=amit.kachhap@arm.com \
--cc=ardb@kernel.org \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=james.morse@arm.com \
--cc=keescook@chromium.org \
--cc=kristina.martsenko@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=ramana.radhakrishnan@arm.com \
--cc=suzuki.poulose@arm.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).