All of lore.kernel.org
 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 v6 18/18] lkdtm: arm64: test kernel pointer authentication
Date: Fri,  6 Mar 2020 12:05:25 +0530	[thread overview]
Message-ID: <1583476525-13505-19-git-send-email-amit.kachhap@arm.com> (raw)
In-Reply-To: <1583476525-13505-1-git-send-email-amit.kachhap@arm.com>

This test is specific for arm64. When in-kernel Pointer Authentication
config is enabled, the return address stored in the stack is signed.
This feature helps in ROP kind of attack. If any parameters used to
generate the pac (<key, sp, lr>) is modified then this will fail in
the authentication stage and will lead to abort.

This test changes the input parameter APIA kernel keys to cause abort.
The pac computed from the new key can be same as last due to hash
collision so this is retried for few times as there is no reliable way
to compare the pacs. Even though this test may fail even after retries
but this may cause authentication failure at a later stage in earlier
function returns.

This test can be invoked as,
echo CORRUPT_PAC > /sys/kernel/debug/provoke-crash/DIRECT

or as below if inserted as a module,
insmod lkdtm.ko cpoint_name=DIRECT cpoint_type=CORRUPT_PAC cpoint_count=1

[   13.118166] lkdtm: Performing direct entry CORRUPT_PAC
[   13.118298] lkdtm: Clearing PAC from the return address
[   13.118466] Unable to handle kernel paging request at virtual address bfff8000108648ec
[   13.118626] Mem abort info:
[   13.118666]   ESR = 0x86000004
[   13.118866]   EC = 0x21: IABT (current EL), IL = 32 bits
[   13.118966]   SET = 0, FnV = 0
[   13.119117]   EA = 0, S1PTW = 0

Cc: Kees Cook <keescook@chromium.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Amit Daniel Kachhap <amit.kachhap@arm.com>
---
 drivers/misc/lkdtm/bugs.c  | 36 ++++++++++++++++++++++++++++++++++++
 drivers/misc/lkdtm/core.c  |  1 +
 drivers/misc/lkdtm/lkdtm.h |  1 +
 3 files changed, 38 insertions(+)

diff --git a/drivers/misc/lkdtm/bugs.c b/drivers/misc/lkdtm/bugs.c
index de87693..cc92bc3 100644
--- a/drivers/misc/lkdtm/bugs.c
+++ b/drivers/misc/lkdtm/bugs.c
@@ -378,3 +378,39 @@ void lkdtm_DOUBLE_FAULT(void)
 	pr_err("XFAIL: this test is ia32-only\n");
 #endif
 }
+
+#ifdef CONFIG_ARM64_PTR_AUTH
+static noinline void change_pac_parameters(void)
+{
+	/* Reset the keys of current task */
+	ptrauth_thread_init_kernel(current);
+	ptrauth_thread_switch_kernel(current);
+}
+
+#define CORRUPT_PAC_ITERATE	10
+noinline void lkdtm_CORRUPT_PAC(void)
+{
+	int i;
+
+	if (!system_supports_address_auth()) {
+		pr_err("FAIL: arm64 pointer authentication feature not present\n");
+		return;
+	}
+
+	pr_info("Change the PAC parameters to force function return failure\n");
+	/*
+	 * Pac is a hash value computed from input keys, return address and
+	 * stack pointer. As pac has fewer bits so there is a chance of
+	 * collision, so iterate few times to reduce the collision probability.
+	 */
+	for (i = 0; i < CORRUPT_PAC_ITERATE; i++)
+		change_pac_parameters();
+
+	pr_err("FAIL: %s test failed. Kernel may be unstable from here\n", __func__);
+}
+#else /* !CONFIG_ARM64_PTR_AUTH */
+noinline void lkdtm_CORRUPT_PAC(void)
+{
+	pr_err("FAIL: arm64 pointer authentication config disabled\n");
+}
+#endif
diff --git a/drivers/misc/lkdtm/core.c b/drivers/misc/lkdtm/core.c
index ee0d6e7..5ce4ac8 100644
--- a/drivers/misc/lkdtm/core.c
+++ b/drivers/misc/lkdtm/core.c
@@ -116,6 +116,7 @@ static const struct crashtype crashtypes[] = {
 	CRASHTYPE(STACK_GUARD_PAGE_LEADING),
 	CRASHTYPE(STACK_GUARD_PAGE_TRAILING),
 	CRASHTYPE(UNSET_SMEP),
+	CRASHTYPE(CORRUPT_PAC),
 	CRASHTYPE(UNALIGNED_LOAD_STORE_WRITE),
 	CRASHTYPE(OVERWRITE_ALLOCATION),
 	CRASHTYPE(WRITE_AFTER_FREE),
diff --git a/drivers/misc/lkdtm/lkdtm.h b/drivers/misc/lkdtm/lkdtm.h
index c56d23e..8d13d01 100644
--- a/drivers/misc/lkdtm/lkdtm.h
+++ b/drivers/misc/lkdtm/lkdtm.h
@@ -31,6 +31,7 @@ void lkdtm_UNSET_SMEP(void);
 #ifdef CONFIG_X86_32
 void lkdtm_DOUBLE_FAULT(void);
 #endif
+void lkdtm_CORRUPT_PAC(void);
 
 /* lkdtm_heap.c */
 void __init lkdtm_heap_init(void);
-- 
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-03-06  6:41 UTC|newest]

Thread overview: 67+ 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
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  6:35   ` Amit Daniel Kachhap
2020-03-06 11:37   ` Masahiro Yamada
2020-03-06 11:37     ` Masahiro Yamada
2020-03-06 11:49     ` Vincenzo Frascino
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 ` Amit Daniel Kachhap [this message]
2020-03-10 15:59 ` [PATCH v6 00/18] arm64: " 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=1583476525-13505-19-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.