Message ID | 20250203101839.1223008-12-kevin.brodsky@arm.com (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9711CC02192 for <linux-mm@archiver.kernel.org>; Mon, 3 Feb 2025 10:20:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2245B6B0083; Mon, 3 Feb 2025 05:20:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1AEDE6B008A; Mon, 3 Feb 2025 05:20:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EF4A2280016; Mon, 3 Feb 2025 05:20:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id BDD14280002 for <linux-mm@kvack.org>; Mon, 3 Feb 2025 05:20:36 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 56B671C9E6D for <linux-mm@kvack.org>; Mon, 3 Feb 2025 10:20:26 +0000 (UTC) X-FDA: 83078238852.14.0038C4F Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf28.hostedemail.com (Postfix) with ESMTP id C42F7C0006 for <linux-mm@kvack.org>; Mon, 3 Feb 2025 10:20:24 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of kevin.brodsky@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=kevin.brodsky@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738578024; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w3d8h0fhxSI8KBCb1MJSQD5BFSFLbtAEyQ369Pj935A=; b=Cr4VLXXu4AbNgHYMzJDydGOG2hABBqmfeDiug/T+/TL0LZX2i71h39lsAlDmcd3eFwOQ9C nT8Sqwei/fkizeXjhDSd5Q3qv3LVPjechDYA4G8fRt5zWbsSMrhzHaGbMHwbAWOYoBgTcQ ptGVPmX+mkCi51jhdhiz782FuQ7/eq0= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of kevin.brodsky@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=kevin.brodsky@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738578024; a=rsa-sha256; cv=none; b=zj55BrhzwU3mpBGCDmL1YlTqU/5mBz/foFpiY9HcYEROZNW60ZdVkQsk/QgECo5v102mZN likCQZ93Mk6VZwH4VKXZnuLwOXqYxtZJ5FgdrUFTiFVrlI2Yeh4jPdmuAoftiJBGoz35cB QYa59ppXBSdHpeBBfqz48uY3RJcO6uo= 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 8059E1476; Mon, 3 Feb 2025 02:20:48 -0800 (PST) Received: from e123572-lin.arm.com (e123572-lin.cambridge.arm.com [10.1.194.54]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8DE443F63F; Mon, 3 Feb 2025 02:20:20 -0800 (PST) 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 11/15] mm: Map page tables with privileged pkey Date: Mon, 3 Feb 2025 10:18:35 +0000 Message-ID: <20250203101839.1223008-12-kevin.brodsky@arm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250203101839.1223008-1-kevin.brodsky@arm.com> References: <20250203101839.1223008-1-kevin.brodsky@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: C42F7C0006 X-Stat-Signature: po7c5tti3x1ocaewtgt7ecgdyb3sejxd X-Rspam-User: X-HE-Tag: 1738578024-724353 X-HE-Meta: U2FsdGVkX1+asfeizqJ0s1V5/kHXifHhrpQOLWjuYnMzUBco8xhlOQqn3XY9pRCs3F6NnVy8BtMZFAu3fN8j9JmdUwwtT+NYVKTdAlV36Sl3M7f8A6+aVe7IrxOlMmjSICnL7IlX72t4jmqPDxPFe0THgnI+UzYxEmEVDr2JHpgMARrn27Q49FjFHMP6UQDZ9RDfpLIkledH8nuDMQRyOMXojs7CZ5L8+h4PneuWYmLCg60zaKdIsXgCQRy4EXgOdNp1hYpXzmGMrjtidADQJ8KdVTEAo/FAXWwQ99onLg5qqUc8nU/5mASiJY7L1WJdz2p5vW/0E3bfBdCH3mMVmw0Ae0aRjhcOnVNbbmr/FksdhPKTPNqTIBR2wflel+oXGT6zD22cP7QfUBiasurXFetm8u5fZ1mR88s6Nbrl1hPUSXZ5zCmnINMRYuxQKR28tpIcH5zUTkOjibEXv5MfqrxyVtfdicoVO3SCiK5iFDso3gbaspR3yLlLyb1JSQcxWX7EtoN1/NbmIRmkyz6DAu4kDEElIM9Z5vd6gDjJ7J/3U6nbv6NBp5WHE+R4ReTrsd4sAsN9/8U0/H5s6RR+EuxFVro0RSNBvWy5aH2/3ANe0ENLTmhYwiYUJN5wRQiV2am+E5MNcYM0vBwElcx4j2+5d/MN3SGEizUDRgXAsW9A2leji6jmRkElaV9fzwMCQBTU9GR1nhbbVCMe5sOUiNiKvldQxxKzoD8/YPqr3DeuEdNiTECz0NGWh0WSsdkJkHJsRAMKAjD4wzatF02Toe+rTY27UHDV0ePRZLk0VWksBNWHDwXIjxUSGbaST6byX6pYNtLfBcHuZcXjtHsgCkHGHh4TM40zls692jg7YDKdUvWWkofKk6RXf9fAOe8JeherLxkYwIj7zj9tmlqGK/rF0QcOX3WWWkBAbp2JrIzG4wshEtKp8dp/WI+N0SuBoNY3thC3Ax5S9VAPh9F vUsRf4NS GxAIoM18hQuy2f/18fyKySAeJLpeWyuTITcAn/2Gx6mzrhfPHz8kSQgNMsy8Xopam6wCERBD1iAXEhE8p/mm0KG2FO9ITPtjpURfsCSivWYKBaRf6JM9nzGeujcNNm/LHf4PeeIVSYzPVujTLax9hx95Dux6v2wG8GCFbqMAmLpvtU2tVSnAArbyiA6SIDgCJ/v1h X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: <linux-mm.kvack.org> List-Subscribe: <mailto:majordomo@kvack.org> List-Unsubscribe: <mailto:majordomo@kvack.org> |
Series |
pkeys-based page table hardening
|
expand
|
diff --git a/include/linux/mm.h b/include/linux/mm.h index 721e779647f3..aa01f51fdc6f 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -32,6 +32,7 @@ #include <linux/memremap.h> #include <linux/slab.h> #include <linux/cacheinfo.h> +#include <linux/kpkeys.h> struct mempolicy; struct anon_vma; @@ -2998,6 +2999,8 @@ static inline bool __pagetable_ctor(struct ptdesc *ptdesc) __folio_set_pgtable(folio); lruvec_stat_add_folio(folio, NR_PAGETABLE); + if (kpkeys_protect_pgtable_memory(folio)) + return false; return true; } @@ -3008,6 +3011,7 @@ static inline void pagetable_dtor(struct ptdesc *ptdesc) ptlock_free(ptdesc); __folio_clear_pgtable(folio); lruvec_stat_sub_folio(folio, NR_PAGETABLE); + kpkeys_unprotect_pgtable_memory(folio); } static inline void pagetable_dtor_free(struct ptdesc *ptdesc)
If CONFIG_KPKEYS_HARDENED_PGTABLES is enabled, map allocated page table pages using a privileged pkey (KPKEYS_PKEY_PGTABLES), so that page tables can only be written under guard(kpkeys_hardened_pgtables). This patch is a no-op if CONFIG_KPKEYS_HARDENED_PGTABLES is disabled (default). Signed-off-by: Kevin Brodsky <kevin.brodsky@arm.com> --- include/linux/mm.h | 4 ++++ 1 file changed, 4 insertions(+)