From 6a5f8eabbd4384e6fc031b3da02e689778971abe Mon Sep 17 00:00:00 2001 From: deraadt Date: Tue, 24 Sep 2024 02:22:42 +0000 Subject: [PATCH] for sysctl on arm64, handle CPU_ID_AA64ISAR1 same as CPU_ID_AA64ISAR0 ok sthen --- sys/kern/kern_pledge.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c index c51c93a1f15..51d29d56c02 100644 --- a/sys/kern/kern_pledge.c +++ b/sys/kern/kern_pledge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_pledge.c,v 1.319 2024/09/04 07:45:08 jsg Exp $ */ +/* $OpenBSD: kern_pledge.c,v 1.320 2024/09/24 02:22:42 deraadt Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott @@ -997,6 +997,11 @@ pledge_sysctl(struct proc *p, int miblen, int *mib, void *new) mib[0] == CTL_MACHDEP && mib[1] == CPU_ID_AA64ISAR0) return (0); #endif /* CPU_ID_AA64ISAR0 */ +#ifdef CPU_ID_AA64ISAR1 + if (miblen == 2 && /* arm64 libcrypto inspects CPU features */ + mib[0] == CTL_MACHDEP && mib[1] == CPU_ID_AA64ISAR1) + return (0); +#endif /* CPU_ID_AA64ISAR1 */ snprintf(buf, sizeof(buf), "%s(%d): pledge sysctl %d:", p->p_p->ps_comm, p->p_p->ps_pid, miblen); -- 2.20.1