summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_exec.c
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2015-10-09 01:10:27 +0000
committerderaadt <deraadt@openbsd.org>2015-10-09 01:10:27 +0000
commitdf174574d401c5c122a73e20e0b23ac91a73c4b1 (patch)
treed0c7d0d93f49ae2e4be87da49534a619a719af8a /sys/kern/kern_exec.c
parentAfter replacement alloca() with alloc(), out-of-heap happened when booting (diff)
downloadwireguard-openbsd-df174574d401c5c122a73e20e0b23ac91a73c4b1.tar.xz
wireguard-openbsd-df174574d401c5c122a73e20e0b23ac91a73c4b1.zip
Rename tame() to pledge(). This fairly interface has evolved to be more
strict than anticipated. It allows a programmer to pledge/promise/covenant that their program will operate within an easily defined subset of the Unix environment, or it pays the price.
Diffstat (limited to 'sys/kern/kern_exec.c')
-rw-r--r--sys/kern/kern_exec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 8c2287bc428..d47f2520e4e 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_exec.c,v 1.167 2015/10/07 03:47:43 deraadt Exp $ */
+/* $OpenBSD: kern_exec.c,v 1.168 2015/10/09 01:10:27 deraadt Exp $ */
/* $NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $ */
/*-
@@ -53,7 +53,7 @@
#include <sys/signalvar.h>
#include <sys/stat.h>
#include <sys/conf.h>
-#include <sys/tame.h>
+#include <sys/pledge.h>
#ifdef SYSVSHM
#include <sys/shm.h>
#endif
@@ -551,8 +551,8 @@ sys_execve(struct proc *p, void *v, register_t *retval)
else
atomic_clearbits_int(&pr->ps_flags, PS_SUGIDEXEC);
- atomic_clearbits_int(&pr->ps_flags, PS_TAMED);
- tame_dropwpaths(pr);
+ atomic_clearbits_int(&pr->ps_flags, PS_PLEDGE);
+ pledge_dropwpaths(pr);
/*
* deal with set[ug]id.