linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Amit Daniel Kachhap <amit.kachhap@arm.com>
To: 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>,
	Amit Daniel Kachhap <amit.kachhap@arm.com>,
	Vincenzo Frascino <Vincenzo.Frascino@arm.com>,
	Will Deacon <will@kernel.org>, Ard Biesheuvel <ardb@kernel.org>
Subject: [PATCH v4 13/17] arm64: __show_regs: strip PAC from lr in printk
Date: Thu, 23 Jan 2020 15:50:35 +0530	[thread overview]
Message-ID: <1579774839-19562-14-git-send-email-amit.kachhap@arm.com> (raw)
In-Reply-To: <1579774839-19562-1-git-send-email-amit.kachhap@arm.com>

lr is printed with %pS which will try to find an entry in kallsyms.
After enabling pointer authentication, this match will fail due to
PAC present in the lr.

Strip PAC from the lr to display the correct symbol name.

Suggested-by: James Morse <james.morse@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Amit Daniel Kachhap <amit.kachhap@arm.com>
---
Changes since v3:
 *) Added Catalin's Acked-by.

 arch/arm64/kernel/process.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index 58b4736..883bc2a0 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -262,7 +262,7 @@ void __show_regs(struct pt_regs *regs)
 
 	if (!user_mode(regs)) {
 		printk("pc : %pS\n", (void *)regs->pc);
-		printk("lr : %pS\n", (void *)lr);
+		printk("lr : %pS\n", (void *)ptrauth_strip_insn_pac(lr));
 	} else {
 		printk("pc : %016llx\n", regs->pc);
 		printk("lr : %016llx\n", lr);
-- 
2.7.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-01-23 10:24 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-23 10:20 [PATCH v4 00/17] arm64: return address signing Amit Daniel Kachhap
2020-01-23 10:20 ` [PATCH v4 01/17] arm64: cpufeature: Fix meta-capability cpufeature check Amit Daniel Kachhap
2020-01-23 23:07   ` Suzuki K Poulose
2020-01-24 11:58     ` Amit Kachhap
2020-01-23 10:20 ` [PATCH v4 02/17] arm64: cpufeature: add pointer auth meta-capabilities Amit Daniel Kachhap
2020-01-23 10:20 ` [PATCH v4 03/17] arm64: rename ptrauth key structures to be user-specific Amit Daniel Kachhap
2020-01-23 10:20 ` [PATCH v4 04/17] arm64: install user ptrauth keys at kernel exit time Amit Daniel Kachhap
2020-01-23 10:20 ` [PATCH v4 05/17] arm64: create macro to park cpu in an infinite loop Amit Daniel Kachhap
2020-01-23 10:20 ` [PATCH v4 06/17] arm64: ptrauth: Add bootup/runtime flags for __cpu_setup Amit Daniel Kachhap
2020-01-23 10:20 ` [PATCH v4 07/17] arm64: cpufeature: handle conflicts based on capability Amit Daniel Kachhap
2020-01-23 10:20 ` [PATCH v4 08/17] arm64: enable ptrauth earlier Amit Daniel Kachhap
2020-01-23 10:20 ` [PATCH v4 09/17] arm64: initialize and switch ptrauth kernel keys Amit Daniel Kachhap
2020-01-23 10:20 ` [PATCH v4 10/17] arm64: initialize ptrauth keys for kernel booting task Amit Daniel Kachhap
2020-01-23 10:20 ` [PATCH v4 11/17] arm64: mask PAC bits of __builtin_return_address Amit Daniel Kachhap
2020-01-23 10:20 ` [PATCH v4 12/17] arm64: unwind: strip PAC from kernel addresses Amit Daniel Kachhap
2020-01-23 10:20 ` Amit Daniel Kachhap [this message]
2020-01-23 10:20 ` [PATCH v4 14/17] arm64: suspend: restore the kernel ptrauth keys Amit Daniel Kachhap
2020-01-23 10:20 ` [PATCH v4 15/17] kconfig: Add support for 'as-option' Amit Daniel Kachhap
2020-01-23 10:30   ` Ard Biesheuvel
2020-01-23 10:52     ` Vincenzo Frascino
2020-01-26 14:45       ` Masahiro Yamada
2020-01-27  9:33         ` Vincenzo Frascino
2020-01-23 10:20 ` [PATCH v4 16/17] arm64: compile the kernel with ptrauth return address signing Amit Daniel Kachhap
2020-01-23 10:20 ` [PATCH v4 17/17] lkdtm: arm64: test kernel pointer authentication Amit Daniel Kachhap

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=1579774839-19562-14-git-send-email-amit.kachhap@arm.com \
    --to=amit.kachhap@arm.com \
    --cc=Dave.Martin@arm.com \
    --cc=Vincenzo.Frascino@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).