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 v5 14/17] arm64: suspend: restore the kernel ptrauth keys
Date: Mon, 17 Feb 2020 14:57:45 +0530 [thread overview]
Message-ID: <1581931668-11559-15-git-send-email-amit.kachhap@arm.com> (raw)
In-Reply-To: <1581931668-11559-1-git-send-email-amit.kachhap@arm.com>
This patch restores the kernel keys from current task during
cpu resume after the mmu is turned on and ptrauth is enabled.
Signed-off-by: Amit Daniel Kachhap <amit.kachhap@arm.com>
---
arch/arm64/kernel/sleep.S | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm64/kernel/sleep.S b/arch/arm64/kernel/sleep.S
index 7b2f2e6..f9db925 100644
--- a/arch/arm64/kernel/sleep.S
+++ b/arch/arm64/kernel/sleep.S
@@ -2,6 +2,7 @@
#include <linux/errno.h>
#include <linux/linkage.h>
#include <asm/asm-offsets.h>
+#include <asm/asm_pointer_auth.h>
#include <asm/assembler.h>
#include <asm/smp.h>
@@ -134,6 +135,11 @@ ENTRY(_cpu_resume)
*/
bl cpu_do_resume
+#ifdef CONFIG_ARM64_PTR_AUTH
+ get_current_task x1
+ ptrauth_keys_install_kernel x1, x2, x3, x4
+#endif
+
#ifdef CONFIG_KASAN
mov x0, sp
bl kasan_unpoison_task_stack_below
--
2.7.4
_______________________________________________
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-02-17 9:31 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-17 9:27 [PATCH v5 00/17] arm64: return address signing Amit Daniel Kachhap
2020-02-17 9:27 ` [PATCH v5 01/17] arm64: cpufeature: Fix meta-capability cpufeature check Amit Daniel Kachhap
2020-02-17 9:27 ` [PATCH v5 02/17] arm64: cpufeature: add pointer auth meta-capabilities Amit Daniel Kachhap
2020-02-17 9:27 ` [PATCH v5 03/17] arm64: rename ptrauth key structures to be user-specific Amit Daniel Kachhap
2020-02-17 9:27 ` [PATCH v5 04/17] arm64: install user ptrauth keys at kernel exit time Amit Daniel Kachhap
2020-02-17 9:27 ` [PATCH v5 05/17] arm64: create macro to park cpu in an infinite loop Amit Daniel Kachhap
2020-02-17 9:27 ` [PATCH v5 06/17] arm64: add bootup/runtime flags for __cpu_setup Amit Daniel Kachhap
2020-02-17 9:27 ` [PATCH v5 07/17] arm64: cpufeature: handle conflicts based on capability Amit Daniel Kachhap
2020-02-28 18:18 ` Catalin Marinas
2020-03-02 9:29 ` Amit Kachhap
2020-02-17 9:27 ` [PATCH v5 08/17] arm64: enable ptrauth earlier Amit Daniel Kachhap
2020-02-17 9:27 ` [PATCH v5 09/17] arm64: initialize and switch ptrauth kernel keys Amit Daniel Kachhap
2020-02-17 9:27 ` [PATCH v5 10/17] arm64: initialize ptrauth keys for kernel booting task Amit Daniel Kachhap
2020-02-17 9:27 ` [PATCH v5 11/17] arm64: mask PAC bits of __builtin_return_address Amit Daniel Kachhap
2020-02-17 9:27 ` [PATCH v5 12/17] arm64: unwind: strip PAC from kernel addresses Amit Daniel Kachhap
2020-02-17 9:27 ` [PATCH v5 13/17] arm64: __show_regs: strip PAC from lr in printk Amit Daniel Kachhap
2020-02-17 9:27 ` Amit Daniel Kachhap [this message]
2020-02-28 18:18 ` [PATCH v5 14/17] arm64: suspend: restore the kernel ptrauth keys Catalin Marinas
2020-03-02 10:13 ` Amit Kachhap
2020-02-17 9:27 ` [PATCH v5 15/17] kconfig: Add support for 'as-option' Amit Daniel Kachhap
2020-02-17 9:27 ` Amit Daniel Kachhap
2020-02-17 9:39 ` Masahiro Yamada
2020-02-17 9:39 ` Masahiro Yamada
2020-02-17 10:16 ` Vincenzo Frascino
2020-02-17 10:16 ` Vincenzo Frascino
2020-02-18 0:37 ` Masahiro Yamada
2020-02-18 0:37 ` Masahiro Yamada
2020-02-18 10:14 ` Vincenzo Frascino
2020-02-18 10:14 ` Vincenzo Frascino
2020-02-17 9:27 ` [PATCH v5 16/17] arm64: compile the kernel with ptrauth return address signing Amit Daniel Kachhap
2020-02-28 18:23 ` Catalin Marinas
2020-03-02 10:19 ` Amit Kachhap
2020-03-02 13:16 ` Mark Brown
2020-03-04 11:01 ` Vincenzo Frascino
2020-03-03 9:28 ` Amit Kachhap
2020-03-04 10:53 ` Vincenzo Frascino
2020-02-17 9:27 ` [PATCH v5 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=1581931668-11559-15-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.