summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_exec.c
diff options
context:
space:
mode:
authorhselasky <hselasky@FreeBSD.org>2014-06-28 03:56:17 +0000
committerhselasky <hselasky@FreeBSD.org>2014-06-28 03:56:17 +0000
commit35b126e324b8032aebea9ab6b4daf7c0bf8daed0 (patch)
tree2ebc46d89e79d747fa284f379b1979658216c719 /sys/kern/kern_exec.c
parent02776baefafae26b2e8b15569fe1868071fb550a (diff)
downloadFreeBSD-src-35b126e324b8032aebea9ab6b4daf7c0bf8daed0.zip
FreeBSD-src-35b126e324b8032aebea9ab6b4daf7c0bf8daed0.tar.gz
Pull in r267961 and r267973 again. Fix for issues reported will follow.
Diffstat (limited to 'sys/kern/kern_exec.c')
-rw-r--r--sys/kern/kern_exec.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 078cd38..7d3bad9 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -127,8 +127,7 @@ SYSCTL_INT(_kern, OID_AUTO, disallow_high_osrel, CTLFLAG_RW,
"Disallow execution of binaries built for higher version of the world");
static int map_at_zero = 0;
-TUNABLE_INT("security.bsd.map_at_zero", &map_at_zero);
-SYSCTL_INT(_security_bsd, OID_AUTO, map_at_zero, CTLFLAG_RW, &map_at_zero, 0,
+SYSCTL_INT(_security_bsd, OID_AUTO, map_at_zero, CTLFLAG_RWTUN, &map_at_zero, 0,
"Permit processes to map an object at virtual address 0.");
static int
OpenPOWER on IntegriCloud