From: James Morse <james.morse@arm.com>
To: Amit Daniel Kachhap <amit.kachhap@arm.com>
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>,
Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>,
Vincenzo Frascino <Vincenzo.Frascino@arm.com>,
Will Deacon <will@kernel.org>, Ard Biesheuvel <ardb@kernel.org>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v6 13/18] arm64: unwind: strip PAC from kernel addresses
Date: Mon, 9 Mar 2020 19:03:53 +0000 [thread overview]
Message-ID: <ec2c78db-31e7-9e82-525e-921b9bf6b3a3@arm.com> (raw)
In-Reply-To: <1583476525-13505-14-git-send-email-amit.kachhap@arm.com>
Hi Amit,
On 06/03/2020 06:35, Amit Daniel Kachhap wrote:
> From: Mark Rutland <mark.rutland@arm.com>
>
> When we enable pointer authentication in the kernel, LR values saved to
> the stack will have a PAC which we must strip in order to retrieve the
> real return address.
>
> Strip PACs when unwinding the stack in order to account for this.
This patch had me looking at the wider pointer-auth + ftrace interaction...
> diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c
> index a336cb1..b479df7 100644
> --- a/arch/arm64/kernel/stacktrace.c
> +++ b/arch/arm64/kernel/stacktrace.c
> @@ -14,6 +14,7 @@
> #include <linux/stacktrace.h>
>
> #include <asm/irq.h>
> +#include <asm/pointer_auth.h>
> #include <asm/stack_pointer.h>
> #include <asm/stacktrace.h>
>
> @@ -101,6 +102,8 @@ int notrace unwind_frame(struct task_struct *tsk, struct stackframe *frame)
There is an earlier reader of frame->pc:
| #ifdef CONFIG_FUNCTION_GRAPH_TRACER
| if (tsk->ret_stack &&
| (frame->pc == (unsigned long)return_to_handler)) {
Which leads down the rat-hole of: does this need ptrauth_strip_insn_pac()?
The version of GCC on my desktop supports patchable-function-entry, the function pre-amble
has two nops for use by ftrace[0]. This means if prepare_ftrace_return() re-writes the
saved LR, it does it before the caller paciasp's it.
I think that means if you stack-trace from a function that had been hooked by the
function_graph_tracer, you will see the LR with a PAC, meaning the above == won't match.
The version of LLVM on my desktop however doesn't support patchable-function-entry, it
uses _mcount() to do the ftrace stuff[1]. Here prepare_ftrace_return() overwrites a
paciasp'd LR with one that isn't, which will fail.
Could the ptrauth_strip_insn_pac() call move above the CONFIG_FUNCTION_GRAPH_TRACER block,
and could we add something like:
| depends on (!FTRACE || HAVE_DYNAMIC_FTRACE_WITH_REGS)
to the Kconfig to prevent both FTRACE and PTR_AUTH being enabled unless the compiler has
support for patchable-function-entry?
> }
> #endif /* CONFIG_FUNCTION_GRAPH_TRACER */
>
> + frame->pc = ptrauth_strip_insn_pac(frame->pc);
> +
> /*
> * Frames created upon entry from EL0 have NULL FP and PC values, so
> * don't bother reporting these. Frames created by __noreturn functions
Thanks,
James
[0] gcc (Debian 9.2.1-28) 9.2.1 20200203
0000000000000048 <sync_icache_aliases>:
48: d503201f nop
4c: d503201f nop
50: 90000002 adrp x2, 0 <__icache_flags>
54: d503233f paciasp
58: a9bf7bfd stp x29, x30, [sp, #-16]!
5c: 910003fd mov x29, sp
60: f9400044 ldr x4, [x2]
64: 36000124 tbz w4, #0, 88 <sync_icache_al
[1] clang version 9.0.0-1 (tags/RELEASE_900/final)
0000000000000000 <sync_icache_aliases>:
0: d503233f paciasp
4: a9be4ff4 stp x20, x19, [sp, #-32]!
8: a9017bfd stp x29, x30, [sp, #16]
c: 910043fd add x29, sp, #0x10
10: aa0103f4 mov x20, x1
14: aa0003f3 mov x19, x0
18: 94000000 bl 0 <_mcount>
1c: 90000008 adrp x8, 0 <__icache_flags>
20: f9400108 ldr x8, [x8]
24: 370000a8 tbnz w8, #0, 38 <sync_icache_aliases+0x38>
_______________________________________________
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-09 19:04 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
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 [this message]
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=ec2c78db-31e7-9e82-525e-921b9bf6b3a3@arm.com \
--to=james.morse@arm.com \
--cc=Dave.Martin@arm.com \
--cc=Vincenzo.Frascino@arm.com \
--cc=amit.kachhap@arm.com \
--cc=ardb@kernel.org \
--cc=broonie@kernel.org \
--cc=catalin.marinas@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).