summaryrefslogtreecommitdiff
path: root/sys/uvm/uvm_mmap.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/uvm/uvm_mmap.c')
-rw-r--r--sys/uvm/uvm_mmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/uvm/uvm_mmap.c b/sys/uvm/uvm_mmap.c
index 0911b9689d2..7497c983a9e 100644
--- a/sys/uvm/uvm_mmap.c
+++ b/sys/uvm/uvm_mmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_mmap.c,v 1.131 2016/06/02 17:05:58 schwarze Exp $ */
+/* $OpenBSD: uvm_mmap.c,v 1.132 2016/06/04 16:43:43 sthen Exp $ */
/* $NetBSD: uvm_mmap.c,v 1.49 2001/02/18 21:19:08 chs Exp $ */
/*
@@ -328,7 +328,7 @@ uvm_wxcheck(struct proc *p, char *call)
if (p->p_p->ps_wxcounter++ == 0)
log(LOG_NOTICE, "%s(%d): %s W^X violation\n",
p->p_comm, p->p_pid, call);
- if (uvm_wxabort) {
+ if (!wxallowed || uvm_wxabort) {
struct sigaction sa;
/* Send uncatchable SIGABRT for coredump */