diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-10-28 11:13:41 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-10-28 11:13:41 +0000 |
| commit | 510bcbedcde16408eb54d2818b0fad2d72ffb80f (patch) | |
| tree | 9c2d68513bbbb18c80f8a72633b2d1027bbc706f /sys/kern/kern_exec.c | |
| parent | pid removal; from jan stary (diff) | |
| download | wireguard-openbsd-510bcbedcde16408eb54d2818b0fad2d72ffb80f.tar.xz wireguard-openbsd-510bcbedcde16408eb54d2818b0fad2d72ffb80f.zip | |
move p_pledgenote setting next to NDINIT()
Diffstat (limited to 'sys/kern/kern_exec.c')
| -rw-r--r-- | sys/kern/kern_exec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 168bdd12f9c..950c783f0d2 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_exec.c,v 1.170 2015/10/25 20:39:54 deraadt Exp $ */ +/* $OpenBSD: kern_exec.c,v 1.171 2015/10/28 11:13:41 deraadt Exp $ */ /* $NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $ */ /*- @@ -280,7 +280,6 @@ sys_execve(struct proc *p, void *v, register_t *retval) * Mark this process as "leave me alone, I'm execing". */ atomic_setbits_int(&pr->ps_flags, PS_INEXEC); - p->p_pledgenote = PLEDGE_EXEC; #if NSYSTRACE > 0 if (ISSET(p->p_flag, P_SYSTRACE)) { @@ -292,6 +291,7 @@ sys_execve(struct proc *p, void *v, register_t *retval) goto clrflag; } #endif + p->p_pledgenote = PLEDGE_EXEC; if (pathbuf != NULL) { NDINIT(&nid, LOOKUP, NOFOLLOW, UIO_SYSSPACE, pathbuf, p); } else { |