From: Kevin Brodsky <kevin.brodsky@arm.com>
To: linux-hardening@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Kevin Brodsky <kevin.brodsky@arm.com>,
Andrew Morton <akpm@linux-foundation.org>,
Mark Brown <broonie@kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Jann Horn <jannh@google.com>, Jeff Xu <jeffxu@chromium.org>,
Joey Gouly <joey.gouly@arm.com>, Kees Cook <kees@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Andy Lutomirski <luto@kernel.org>, Marc Zyngier <maz@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Pierre Langlois <pierre.langlois@arm.com>,
Quentin Perret <qperret@google.com>,
"Mike Rapoport (IBM)" <rppt@kernel.org>,
Ryan Roberts <ryan.roberts@arm.com>,
Thomas Gleixner <tglx@linutronix.de>,
Will Deacon <will@kernel.org>,
Matthew Wilcox <willy@infradead.org>,
Qi Zheng <zhengqi.arch@bytedance.com>,
linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org,
x86@kernel.org
Subject: [RFC PATCH v3 15/15] mm: Add basic tests for kpkeys_hardened_pgtables
Date: Mon, 3 Feb 2025 10:18:39 +0000 [thread overview]
Message-ID: <20250203101839.1223008-16-kevin.brodsky@arm.com> (raw)
In-Reply-To: <20250203101839.1223008-1-kevin.brodsky@arm.com>
Add basic tests for the kpkeys_hardened_pgtables feature: try to
perform a direct write to some kernel and user page table entry and
ensure it fails.
Signed-off-by: Kevin Brodsky <kevin.brodsky@arm.com>
---
mm/Makefile | 1 +
mm/kpkeys_hardened_pgtables_test.c | 72 ++++++++++++++++++++++++++++++
security/Kconfig.hardening | 12 +++++
3 files changed, 85 insertions(+)
create mode 100644 mm/kpkeys_hardened_pgtables_test.c
diff --git a/mm/Makefile b/mm/Makefile
index 130691364172..f7263b7f45b8 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -148,3 +148,4 @@ obj-$(CONFIG_EXECMEM) += execmem.o
obj-$(CONFIG_TMPFS_QUOTA) += shmem_quota.o
obj-$(CONFIG_PT_RECLAIM) += pt_reclaim.o
obj-$(CONFIG_KPKEYS_HARDENED_PGTABLES) += kpkeys_hardened_pgtables.o
+obj-$(CONFIG_KPKEYS_HARDENED_PGTABLES_TEST) += kpkeys_hardened_pgtables_test.o
diff --git a/mm/kpkeys_hardened_pgtables_test.c b/mm/kpkeys_hardened_pgtables_test.c
new file mode 100644
index 000000000000..86d862d43bea
--- /dev/null
+++ b/mm/kpkeys_hardened_pgtables_test.c
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <kunit/test.h>
+#include <linux/pgtable.h>
+#include <linux/mman.h>
+
+static void write_kernel_pte(struct kunit *test)
+{
+ pte_t *ptep;
+ pte_t pte;
+ int ret;
+
+ /*
+ * The choice of address is mostly arbitrary - we just need a page
+ * that is definitely mapped, such as the current function.
+ */
+ ptep = virt_to_kpte((unsigned long)&write_kernel_pte);
+ KUNIT_ASSERT_NOT_NULL_MSG(test, ptep, "Failed to get PTE");
+
+ pte = ptep_get(ptep);
+ pte = set_pte_bit(pte, __pgprot(PTE_WRITE));
+ ret = copy_to_kernel_nofault(ptep, &pte, sizeof(pte));
+ KUNIT_EXPECT_EQ_MSG(test, ret, -EFAULT,
+ "Direct PTE write wasn't prevented");
+}
+
+static void write_user_pmd(struct kunit *test)
+{
+ pmd_t *pmdp;
+ pmd_t pmd;
+ unsigned long uaddr;
+ int ret;
+
+ uaddr = kunit_vm_mmap(test, NULL, 0, PAGE_SIZE, PROT_READ,
+ MAP_ANONYMOUS | MAP_PRIVATE | MAP_POPULATE, 0);
+ KUNIT_ASSERT_NE_MSG(test, uaddr, 0, "Could not create userspace mm");
+
+ /* We passed MAP_POPULATE so a PMD should already be allocated */
+ pmdp = pmd_off(current->mm, uaddr);
+ KUNIT_ASSERT_NOT_NULL_MSG(test, pmdp, "Failed to get PMD");
+
+ pmd = pmdp_get(pmdp);
+ pmd = set_pmd_bit(pmd, __pgprot(PROT_SECT_NORMAL));
+ ret = copy_to_kernel_nofault(pmdp, &pmd, sizeof(pmd));
+ KUNIT_EXPECT_EQ_MSG(test, ret, -EFAULT,
+ "Direct PMD write wasn't prevented");
+}
+
+static int kpkeys_hardened_pgtables_suite_init(struct kunit_suite *suite)
+{
+ if (!arch_kpkeys_enabled()) {
+ pr_err("Cannot run kpkeys_hardened_pgtables tests: kpkeys are not supported\n");
+ return 1;
+ }
+
+ return 0;
+}
+
+static struct kunit_case kpkeys_hardened_pgtables_test_cases[] = {
+ KUNIT_CASE(write_kernel_pte),
+ KUNIT_CASE(write_user_pmd),
+ {}
+};
+
+static struct kunit_suite kpkeys_hardened_pgtables_test_suite = {
+ .name = "Hardened pgtables using kpkeys",
+ .test_cases = kpkeys_hardened_pgtables_test_cases,
+ .suite_init = kpkeys_hardened_pgtables_suite_init,
+};
+kunit_test_suite(kpkeys_hardened_pgtables_test_suite);
+
+MODULE_DESCRIPTION("Tests for the kpkeys_hardened_pgtables feature");
+MODULE_LICENSE("GPL");
diff --git a/security/Kconfig.hardening b/security/Kconfig.hardening
index f729488eac56..649847535fc3 100644
--- a/security/Kconfig.hardening
+++ b/security/Kconfig.hardening
@@ -313,6 +313,18 @@ config KPKEYS_HARDENED_PGTABLES
This option has no effect if the system does not support
kernel pkeys.
+config KPKEYS_HARDENED_PGTABLES_TEST
+ tristate "KUnit tests for kpkeys_hardened_pgtables" if !KUNIT_ALL_TESTS
+ depends on KPKEYS_HARDENED_PGTABLES
+ depends on KUNIT
+ default KUNIT_ALL_TESTS
+ help
+ Enable this option to check that the kpkeys_hardened_pgtables feature
+ functions as intended, i.e. prevents arbitrary writes to user and
+ kernel page tables.
+
+ If unsure, say N.
+
endmenu
config CC_HAS_RANDSTRUCT
--
2.47.0
next prev parent reply other threads:[~2025-02-03 10:20 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-03 10:18 [RFC PATCH v3 00/15] pkeys-based page table hardening Kevin Brodsky
2025-02-03 10:18 ` [RFC PATCH v3 01/15] mm: Introduce kpkeys Kevin Brodsky
2025-02-03 10:18 ` [RFC PATCH v3 02/15] set_memory: Introduce set_memory_pkey() stub Kevin Brodsky
2025-02-03 10:18 ` [RFC PATCH v3 03/15] arm64: mm: Enable overlays for all EL1 indirect permissions Kevin Brodsky
2025-02-03 10:18 ` [RFC PATCH v3 04/15] arm64: Introduce por_set_pkey_perms() helper Kevin Brodsky
2025-02-03 10:18 ` [RFC PATCH v3 05/15] arm64: Implement asm/kpkeys.h using POE Kevin Brodsky
2025-02-03 10:18 ` [RFC PATCH v3 06/15] arm64: set_memory: Implement set_memory_pkey() Kevin Brodsky
2025-02-03 10:18 ` [RFC PATCH v3 07/15] arm64: Enable kpkeys Kevin Brodsky
2025-02-03 10:18 ` [RFC PATCH v3 08/15] mm: Introduce kernel_pgtables_set_pkey() Kevin Brodsky
2025-02-06 19:01 ` Linus Walleij
2025-02-07 14:33 ` Kevin Brodsky
2025-02-03 10:18 ` [RFC PATCH v3 09/15] mm: Introduce kpkeys_hardened_pgtables Kevin Brodsky
2025-02-03 10:18 ` [RFC PATCH v3 10/15] mm: Allow __pagetable_ctor() to fail Kevin Brodsky
2025-02-03 10:18 ` [RFC PATCH v3 11/15] mm: Map page tables with privileged pkey Kevin Brodsky
2025-02-03 10:18 ` [RFC PATCH v3 12/15] arm64: kpkeys: Support KPKEYS_LVL_PGTABLES Kevin Brodsky
2025-02-03 10:18 ` [RFC PATCH v3 13/15] arm64: mm: Guard page table writes with kpkeys Kevin Brodsky
2025-02-03 10:18 ` [RFC PATCH v3 14/15] arm64: Enable kpkeys_hardened_pgtables support Kevin Brodsky
2025-02-03 10:18 ` Kevin Brodsky [this message]
2025-02-06 22:41 ` [RFC PATCH v3 00/15] pkeys-based page table hardening Kees Cook
2025-02-10 14:23 ` Kevin Brodsky
2025-02-13 14:54 ` Kevin Brodsky
2025-03-06 16:23 ` Maxwell Bland
2025-03-13 12:32 ` Kevin Brodsky
2025-03-19 21:54 ` Maxwell Bland
2025-03-25 17:11 ` Kevin Brodsky
2025-03-28 16:15 ` Maxwell Bland
2025-04-04 7:57 ` Kevin Brodsky
2025-04-14 22:43 ` Maxwell Bland
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=20250203101839.1223008-16-kevin.brodsky@arm.com \
--to=kevin.brodsky@arm.com \
--cc=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=dave.hansen@linux.intel.com \
--cc=jannh@google.com \
--cc=jeffxu@chromium.org \
--cc=joey.gouly@arm.com \
--cc=kees@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=maz@kernel.org \
--cc=peterz@infradead.org \
--cc=pierre.langlois@arm.com \
--cc=qperret@google.com \
--cc=rppt@kernel.org \
--cc=ryan.roberts@arm.com \
--cc=tglx@linutronix.de \
--cc=will@kernel.org \
--cc=willy@infradead.org \
--cc=x86@kernel.org \
--cc=zhengqi.arch@bytedance.com \
/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