From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 51ABCFF8855 for ; Tue, 5 May 2026 16:08:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=+rJQQXqc/pgs4y72MEHaFoTC6kS2XVmfoerGcbGJgWc=; b=uKNG1OFD5JuVLq6cE2eyj1Cdmf Wi18fcwOQK2q6hFHxh00ZwhYOLTMFY5fYBDxNYCBLuzKCxgbpJ0wor6R+JwrqO0EE2ddwoXLG6A4h KyTmFThDeNd1xMRGrvRSlpnDbVa/mtA56WI8AB7bQwLQKEUPLbCmbA0vE6jxFNPQakN2wmEI94er9 Bqk+11YrPhMdolYl7JUs5zrBzm/DoMLoX48ew7SHHetNTNIDgGRJnM9uBVJoaJNbOV81DFBTxv0tH ErwBsC3zX+ggWYmTW+l1TT1Vuceo+XuP25P+43MYEbANGd3kRXPu+9cRRvJRVNO3IVH9KrTEXLskc KTOBshNA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wKIJR-0000000GnMW-3vb7; Tue, 05 May 2026 16:07:57 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wKIJP-0000000GnIu-0JoS for linux-arm-kernel@lists.infradead.org; Tue, 05 May 2026 16:07:56 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8F7002681; Tue, 5 May 2026 09:07:48 -0700 (PDT) Received: from localhost.localdomain (e123572-lin.cambridge.arm.com [10.1.194.54]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CA3DA3F763; Tue, 5 May 2026 09:07:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1777997273; bh=ozeOAdr3jlygQ+LzFQQTepylRW4GqnLBcYHZvpRCf6g=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=oDYOzeRrxGkb6WgoF0/tyhcey0msj2rO63eaDHL/bZMbXnLNk38qmc2noaeoKNg8i j8Z/2K7AQVJRPSMdDymRQUZUTGRMnJcfZLiSBSBMLyV7UxJ+P7EpkRcli994jTEJGD Oc0LULVHGtjY3GvmDi9RsdzEtatCBoO9JuZW+ySQ= From: Kevin Brodsky Date: Tue, 05 May 2026 17:06:00 +0100 Subject: [PATCH RFC v7 11/24] mm: kpkeys: Introduce kpkeys_hardened_pgtables feature MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260505-kpkeys-v7-11-20c0bdd97197@arm.com> References: <20260505-kpkeys-v7-0-20c0bdd97197@arm.com> In-Reply-To: <20260505-kpkeys-v7-0-20c0bdd97197@arm.com> To: linux-hardening@vger.kernel.org Cc: Kevin Brodsky , Andrew Morton , Andy Lutomirski , Catalin Marinas , Dave Hansen , "David Hildenbrand (Arm)" , Ira Weiny , Jann Horn , Jeff Xu , Joey Gouly , Kees Cook , Linus Walleij , Marc Zyngier , Mark Brown , Matthew Wilcox , Maxwell Bland , "Mike Rapoport (IBM)" , Peter Zijlstra , Pierre Langlois , Quentin Perret , Rick Edgecombe , Ryan Roberts , Will Deacon , Yang Shi , Yeoreum Yun , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, x86@kernel.org, Lorenzo Stoakes , Thomas Gleixner , Vlastimil Babka X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1777997220; l=5877; i=kevin.brodsky@arm.com; s=20260427; h=from:subject:message-id; bh=ozeOAdr3jlygQ+LzFQQTepylRW4GqnLBcYHZvpRCf6g=; b=eU7WrOKEsysSiJ7rQ1VLcmV9b9H85aOAXkzAXSutH6Aajlxhc3Iyh95ydDqhVRFPKQr6UUuUE QFdbj/hha2nBMtl+J4l+gDkDdlWAalvI6ADOBzdJcUQAWtlYjqbGbgX X-Developer-Key: i=kevin.brodsky@arm.com; a=ed25519; pk=N2QG+eJKrvkNovwhhwJhnJ4+ScVfsGCHldmqLfcMTFs= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260505_090755_200891_54990831 X-CRM114-Status: GOOD ( 23.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org kpkeys_hardened_pgtables is a hardening feature based on kpkeys. It aims to prevent the corruption of page tables by: 1. mapping all page table pages, both kernel and user, with a privileged pkey (KPKEYS_PKEY_PGTABLES), and 2. granting write access to that pkey only when running at in a privileged kpkeys context (KPKEYS_CTX_PGTABLES). This patch introduces basic infrastructure; the implementation of both aspects will follow. The feature is exposed as CONFIG_KPKEYS_HARDENED_PGTABLES; it requires explicit architecture opt-in by selecting ARCH_HAS_KPKEYS_HARDENED_PGTABLES, since much of the page table handling is arch-specific. Because this feature relies on kpkeys being available and enabled, and modifies attributes of the linear map, it must be inactive on boot. kpkeys_hardened_pgtables_init() enables it by toggling a static key; this function must be called by supported architectures in mem_init(), before any call to pagetable_alloc() is made. Supported architectures must also provide arch_supports_kpkeys_early() in . This will be used during early boot to detect whether kpkeys_hardened_pgtables is going to be enabled (e.g. to decide how to allocate early page tables). Signed-off-by: Kevin Brodsky --- include/asm-generic/kpkeys.h | 4 ++++ include/linux/kpkeys.h | 40 +++++++++++++++++++++++++++++++++++++++- mm/Kconfig | 3 +++ mm/Makefile | 1 + mm/kpkeys_hardened_pgtables.c | 16 ++++++++++++++++ security/Kconfig.hardening | 12 ++++++++++++ 6 files changed, 75 insertions(+), 1 deletion(-) diff --git a/include/asm-generic/kpkeys.h b/include/asm-generic/kpkeys.h index ab819f157d6a..cec92334a9f3 100644 --- a/include/asm-generic/kpkeys.h +++ b/include/asm-generic/kpkeys.h @@ -2,6 +2,10 @@ #ifndef __ASM_GENERIC_KPKEYS_H #define __ASM_GENERIC_KPKEYS_H +#ifndef KPKEYS_PKEY_PGTABLES +#define KPKEYS_PKEY_PGTABLES 1 +#endif + #ifndef KPKEYS_PKEY_DEFAULT #define KPKEYS_PKEY_DEFAULT 0 #endif diff --git a/include/linux/kpkeys.h b/include/linux/kpkeys.h index cb2d22758391..1ed0299ad5ac 100644 --- a/include/linux/kpkeys.h +++ b/include/linux/kpkeys.h @@ -4,11 +4,13 @@ #include #include +#include #define KPKEYS_CTX_DEFAULT 0 +#define KPKEYS_CTX_PGTABLES 1 #define KPKEYS_CTX_MIN KPKEYS_CTX_DEFAULT -#define KPKEYS_CTX_MAX KPKEYS_CTX_DEFAULT +#define KPKEYS_CTX_MAX KPKEYS_CTX_PGTABLES #define __KPKEYS_GUARD(name, set_context, restore_pkey_reg, set_arg, ...) \ __DEFINE_CLASS_IS_CONDITIONAL(name, false); \ @@ -115,4 +117,40 @@ static inline bool kpkeys_enabled(void) #endif /* CONFIG_ARCH_HAS_KPKEYS */ +#ifdef CONFIG_KPKEYS_HARDENED_PGTABLES + +DECLARE_STATIC_KEY_FALSE(kpkeys_hardened_pgtables_key); + +static inline bool kpkeys_hardened_pgtables_enabled(void) +{ + return static_branch_unlikely(&kpkeys_hardened_pgtables_key); +} + +static inline bool kpkeys_hardened_pgtables_early_enabled(void) +{ + return arch_supports_kpkeys_early(); +} + +/* + * Should be called from mem_init(): as soon as the buddy allocator becomes + * available and before any call to pagetable_alloc(). + */ +void kpkeys_hardened_pgtables_init(void); + +#else /* CONFIG_KPKEYS_HARDENED_PGTABLES */ + +static inline bool kpkeys_hardened_pgtables_enabled(void) +{ + return false; +} + +static inline bool kpkeys_hardened_pgtables_early_enabled(void) +{ + return false; +} + +static inline void kpkeys_hardened_pgtables_init(void) {} + +#endif /* CONFIG_KPKEYS_HARDENED_PGTABLES */ + #endif /* _LINUX_KPKEYS_H */ diff --git a/mm/Kconfig b/mm/Kconfig index 819fb0d7b7bd..dbba6b878d5a 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -1244,6 +1244,9 @@ config ARCH_HAS_PKEYS bool config ARCH_HAS_KPKEYS bool +# ARCH_HAS_KPKEYS must be selected when selecting this option +config ARCH_HAS_KPKEYS_HARDENED_PGTABLES + bool config ARCH_USES_PG_ARCH_2 bool diff --git a/mm/Makefile b/mm/Makefile index 8ad2ab08244e..7603e6051afa 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -150,3 +150,4 @@ obj-$(CONFIG_SHRINKER_DEBUG) += shrinker_debug.o obj-$(CONFIG_EXECMEM) += execmem.o obj-$(CONFIG_TMPFS_QUOTA) += shmem_quota.o obj-$(CONFIG_LAZY_MMU_MODE_KUNIT_TEST) += tests/lazy_mmu_mode_kunit.o +obj-$(CONFIG_KPKEYS_HARDENED_PGTABLES) += kpkeys_hardened_pgtables.o diff --git a/mm/kpkeys_hardened_pgtables.c b/mm/kpkeys_hardened_pgtables.c new file mode 100644 index 000000000000..763f267bbfe4 --- /dev/null +++ b/mm/kpkeys_hardened_pgtables.c @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include +#include + +#include + +__ro_after_init DEFINE_STATIC_KEY_FALSE(kpkeys_hardened_pgtables_key); +EXPORT_SYMBOL_IF_KUNIT(kpkeys_hardened_pgtables_key); + +void __init kpkeys_hardened_pgtables_init(void) +{ + if (!kpkeys_enabled()) + return; + + static_branch_enable(&kpkeys_hardened_pgtables_key); +} diff --git a/security/Kconfig.hardening b/security/Kconfig.hardening index 86f8768c63d4..fdaf977d4626 100644 --- a/security/Kconfig.hardening +++ b/security/Kconfig.hardening @@ -275,6 +275,18 @@ config BUG_ON_DATA_CORRUPTION If unsure, say N. +config KPKEYS_HARDENED_PGTABLES + bool "Harden page tables using kernel pkeys" + depends on ARCH_HAS_KPKEYS_HARDENED_PGTABLES + help + This option makes all page tables mostly read-only by + allocating them with a non-default protection key (pkey) and + only enabling write access to that pkey in routines that are + expected to write to page table entries. + + This option has no effect if the system does not support + kernel pkeys. + endmenu config CC_HAS_RANDSTRUCT -- 2.51.2