Page MenuHomeFreeBSD
Files F108433023

D47818.diff
No OneTemporary
Actions

D47818.diff
View Options

diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c
--- a/sys/arm64/arm64/machdep.c
+++ b/sys/arm64/arm64/machdep.c
@@ -1010,13 +1010,6 @@
/* Detect early CPU feature support */
enable_cpu_feat(CPU_FEAT_EARLY_BOOT);
- /*
- * Check if pointer authentication is available on this system, and
- * if so enable its use. This needs to be called before init_proc0
- * as that will configure the thread0 pointer authentication keys.
- */
- ptrauth_init();
-
/*
* Dump the boot metadata. We have to wait for cninit() since console
* output is required. If it's grossly incorrect the kernel will never
diff --git a/sys/arm64/arm64/ptrauth.c b/sys/arm64/arm64/ptrauth.c
--- a/sys/arm64/arm64/ptrauth.c
+++ b/sys/arm64/arm64/ptrauth.c
@@ -43,6 +43,7 @@
#include <machine/armreg.h>
#include <machine/cpu.h>
+#include <machine/cpu_feat.h>
#include <machine/reg.h>
#include <machine/vmparam.h>
@@ -81,8 +82,8 @@
return (false);
}
-void
-ptrauth_init(void)
+static bool
+ptrauth_check(const struct cpu_feat *feat __unused, u_int midr __unused)
{
uint64_t isar1;
int pac_enable;
@@ -96,28 +97,43 @@
if (!pac_enable) {
if (boothowto & RB_VERBOSE)
printf("Pointer authentication is disabled\n");
- return;
+ return (false);
}
if (!get_kernel_reg(ID_AA64ISAR1_EL1, &isar1))
- return;
+ return (false);
if (ptrauth_disable())
- return;
+ return (false);
/*
* This assumes if there is pointer authentication on the boot CPU
* it will also be available on any non-boot CPUs. If this is ever
* not the case we will have to add a quirk.
*/
- if (ID_AA64ISAR1_APA_VAL(isar1) > 0 ||
- ID_AA64ISAR1_API_VAL(isar1) > 0) {
- enable_ptrauth = true;
- elf64_addr_mask.code |= PAC_ADDR_MASK;
- elf64_addr_mask.data |= PAC_ADDR_MASK;
- }
+ return (ID_AA64ISAR1_APA_VAL(isar1) > 0 ||
+ ID_AA64ISAR1_API_VAL(isar1) > 0);
}
+static void
+ptrauth_enable(const struct cpu_feat *feat __unused,
+ cpu_feat_errata errata_status __unused, u_int *errata_list __unused,
+ u_int errata_count __unused)
+{
+ enable_ptrauth = true;
+ elf64_addr_mask.code |= PAC_ADDR_MASK;
+ elf64_addr_mask.data |= PAC_ADDR_MASK;
+}
+
+
+static struct cpu_feat feat_pauth = {
+ .feat_name = "FEAT_PAuth",
+ .feat_check = ptrauth_check,
+ .feat_enable = ptrauth_enable,
+ .feat_flags = CPU_FEAT_EARLY_BOOT | CPU_FEAT_SYSTEM,
+};
+DATA_SET(cpu_feat_set, feat_pauth);
+
/* Copy the keys when forking a new process */
void
ptrauth_fork(struct thread *new_td, struct thread *orig_td)

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 25, 5:46 PM (18 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16146218
Default Alt Text
D47818.diff (2 KB)

Event Timeline