| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220419170649.1022246-24-ira.weiny@intel.com>
Date: Tue, 19 Apr 2022 10:06:28 -0700
From: ira.weiny@...el.com
To: Dave Hansen <dave.hansen@...ux.intel.com>,
"H. Peter Anvin" <hpa@...or.com>,
Dan Williams <dan.j.williams@...el.com>
Cc: Ira Weiny <ira.weiny@...el.com>, Fenghua Yu <fenghua.yu@...el.com>,
Rick Edgecombe <rick.p.edgecombe@...el.com>,
"Shankar, Ravi V" <ravi.v.shankar@...el.com>,
linux-kernel@...r.kernel.org
Subject: [PATCH V10 23/44] mm/pkeys: Introduce pks_update_exception()
From: Ira Weiny <ira.weiny@...el.com>
Some PKS use cases will want to catch permissions violations with the
fault callback mechanism and optionally allow the access.
The pks_set_*() calls update the protection of the current running
context. They will not work to change the protections of a thread which
has been interrupted. Therefore updating a thread from within an
exception requires a different method.
Introduce pks_update_exception() which updates the faulted threads
protections in addition to the current context.
Add documentation
Signed-off-by: Ira Weiny <ira.weiny@...el.com>
---
Changes for V9
Add preemption disable around pkrs per cpu cache
Update commit message
Change pkey type to u8
s/pks_saved_pkrs/pkrs
Changes for V8
Remove the concept of abandoning a pkey in favor of using the
custom fault handler via this new pks_update_exception()
call
Without an abandon call there is no need for an abandon mask on
sched in, new thread creation, or within exceptions...
This now lets all invalid access' fault
Ensure that all entry points into the pks has feature checks...
Place abandon fault check before the test callback to ensure
testing does not detect the double fault of the abandon
code and flag it incorrectly as a fault.
Change return type of pks_handle_abandoned_pkeys() to bool
---
Documentation/core-api/protection-keys.rst | 3 ++
arch/x86/mm/pkeys.c | 58 +++++++++++++++++++---
include/linux/pks.h | 5 ++
3 files changed, 58 insertions(+), 8 deletions(-)
diff --git a/Documentation/core-api/protection-keys.rst b/Documentation/core-api/protection-keys.rst
index f309cecc3915..c5f0f5d39929 100644
--- a/Documentation/core-api/protection-keys.rst
+++ b/Documentation/core-api/protection-keys.rst
@@ -149,6 +149,9 @@ Changing permissions of individual keys
.. kernel-doc:: include/linux/pks.h
:identifiers: pks_set_readwrite pks_set_noaccess
+.. kernel-doc:: arch/x86/mm/pkeys.c
+ :identifiers: pks_update_exception
+
Overriding Default Fault Behavior
---------------------------------
diff --git a/arch/x86/mm/pkeys.c b/arch/x86/mm/pkeys.c
index a993c9b23815..975ed206d957 100644
--- a/arch/x86/mm/pkeys.c
+++ b/arch/x86/mm/pkeys.c
@@ -405,6 +405,18 @@ void pks_setup(void)
cr4_set_bits(X86_CR4_PKS);
}
+static void __pks_update_protection(u8 pkey, u8 protection)
+{
+ u32 pkrs;
+
+ pkrs = current->thread.pkrs;
+ current->thread.pkrs = pkey_update_pkval(pkrs, pkey, protection);
+
+ preempt_disable();
+ pks_write_pkrs(current->thread.pkrs);
+ preempt_enable();
+}
+
/*
* Do not call this directly, see pks_set*().
*
@@ -418,21 +430,51 @@ void pks_setup(void)
*/
void pks_update_protection(u8 pkey, u8 protection)
{
- u32 pkrs;
-
if (!cpu_feature_enabled(X86_FEATURE_PKS))
return;
if (WARN_ON_ONCE(pkey >= PKS_KEY_MAX))
return;
- pkrs = current->thread.pkrs;
- current->thread.pkrs = pkey_update_pkval(pkrs, pkey,
- protection);
- preempt_disable();
- pks_write_pkrs(current->thread.pkrs);
- preempt_enable();
+ __pks_update_protection(pkey, protection);
}
EXPORT_SYMBOL_GPL(pks_update_protection);
+/**
+ * pks_update_exception() - Update the protections of a faulted thread
+ *
+ * @regs: Faulting thread registers
+ * @pkey: pkey to update
+ * @protection: protection bits to use.
+ *
+ * CONTEXT: Exception
+ *
+ * pks_update_exception() updates the faulted threads protections in addition
+ * to the protections within the exception.
+ *
+ * This is useful because the pks_set_*() functions will not work to change the
+ * protections of a thread which has been interrupted. Only the current
+ * context is updated by those functions. Therefore, if a PKS fault callback
+ * wants to update the faulted threads protections it must call
+ * pks_update_exception().
+ */
+void pks_update_exception(struct pt_regs *regs, u8 pkey, u8 protection)
+{
+ struct pt_regs_extended *ept_regs;
+ u32 old;
+
+ if (!cpu_feature_enabled(X86_FEATURE_PKS))
+ return;
+
+ if (WARN_ON_ONCE(pkey >= PKS_KEY_MAX))
+ return;
+
+ __pks_update_protection(pkey, protection);
+
+ ept_regs = to_extended_pt_regs(regs);
+ old = ept_regs->aux.pkrs;
+ ept_regs->aux.pkrs = pkey_update_pkval(old, pkey, protection);
+}
+EXPORT_SYMBOL_GPL(pks_update_exception);
+
#endif /* CONFIG_ARCH_ENABLE_SUPERVISOR_PKEYS */
diff --git a/include/linux/pks.h b/include/linux/pks.h
index d0d8bf1aaa1d..2ea5fb57f2dc 100644
--- a/include/linux/pks.h
+++ b/include/linux/pks.h
@@ -9,6 +9,7 @@
#include <uapi/asm-generic/mman-common.h>
void pks_update_protection(u8 pkey, u8 protection);
+void pks_update_exception(struct pt_regs *regs, u8 pkey, u8 protection);
/**
* pks_set_noaccess() - Disable all access to the domain
@@ -41,6 +42,10 @@ typedef bool (*pks_key_callback)(struct pt_regs *regs, unsigned long address,
static inline void pks_set_noaccess(u8 pkey) {}
static inline void pks_set_readwrite(u8 pkey) {}
+static inline void pks_update_exception(struct pt_regs *regs,
+ u8 pkey,
+ u8 protection)
+{ }
#endif /* CONFIG_ARCH_ENABLE_SUPERVISOR_PKEYS */
--
2.35.1
Powered by blists - more mailing lists