From 0d3e0c92641e6618e49f561dbcba3acc54ef7bfb Mon Sep 17 00:00:00 2001 From: deraadt Date: Wed, 25 Mar 2026 05:05:41 +0000 Subject: [PATCH] Wrap the pledge-related sysctl code in SMALL_KERNEL, because it is big and the ramdisk does not need it ok mlarkin, discussed with dgl --- sys/kern/kern_pledge.c | 4 +++- sys/kern/kern_sysctl.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c index 411a04ec062..77c47f05e3e 100644 --- a/sys/kern/kern_pledge.c +++ b/sys/kern/kern_pledge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_pledge.c,v 1.351 2026/03/24 05:48:09 deraadt Exp $ */ +/* $OpenBSD: kern_pledge.c,v 1.352 2026/03/25 05:05:41 deraadt Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott @@ -760,6 +760,7 @@ pledge_sendfd(struct proc *p, struct file *fp) return pledge_fail(p, EINVAL, PLEDGE_SENDFD); } +#ifndef SMALL_KERNEL int pledge_sysctl(struct proc *p, int miblen, int *mib, void *new) { @@ -951,6 +952,7 @@ pledge_sysctl(struct proc *p, int miblen, int *mib, void *new) return pledge_fail(p, EINVAL, 0); } +#endif /* SMALL_KERNEL */ int pledge_chown(struct proc *p, uid_t uid, gid_t gid) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index ae31cc20159..e196df44620 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.485 2026/02/11 22:34:41 deraadt Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.486 2026/03/25 05:05:41 deraadt Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -251,10 +251,12 @@ sys_sysctl(struct proc *p, void *v, register_t *retval) if (error) return (error); +#ifndef SMALL_KERNEL error = pledge_sysctl(p, SCARG(uap, namelen), name, SCARG(uap, new)); if (error) return (error); +#endif /* SMALL_KERNEL */ switch (name[0]) { case CTL_KERN: