summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_exec.c
diff options
context:
space:
mode:
authorjca <jca@openbsd.org>2016-09-03 14:28:24 +0000
committerjca <jca@openbsd.org>2016-09-03 14:28:24 +0000
commit131b88b7644b35e8c11076b61c4b82a23c06b3f6 (patch)
tree92d37d1df5098b65a83257577446641b0fa51818 /sys/kern/kern_exec.c
parentIncrease the number of mbufs on most architectures. This is based (diff)
downloadwireguard-openbsd-131b88b7644b35e8c11076b61c4b82a23c06b3f6.tar.xz
wireguard-openbsd-131b88b7644b35e8c11076b61c4b82a23c06b3f6.zip
Reset PS_WXNEEDED in execve(2).
The new process should inherit wxneeded perms from the ELF executable only, not from the former process. Solution improved by guenther@, ok guenther@ deraadt@, ok tedu@ on a similar diff.
Diffstat (limited to 'sys/kern/kern_exec.c')
-rw-r--r--sys/kern/kern_exec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 09f551225bd..6eb928204f0 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_exec.c,v 1.182 2016/06/11 21:00:11 kettenis Exp $ */
+/* $OpenBSD: kern_exec.c,v 1.183 2016/09/03 14:28:24 jca Exp $ */
/* $NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $ */
/*-
@@ -700,6 +700,8 @@ sys_execve(struct proc *p, void *v, register_t *retval)
if (pack.ep_flags & EXEC_WXNEEDED)
p->p_p->ps_flags |= PS_WXNEEDED;
+ else
+ p->p_p->ps_flags &= ~PS_WXNEEDED;
/*
* Call exec hook. Emulation code may NOT store reference to anything