[src/trunk]: src/sys/kern GC PAX_ASLR_EXEC

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/81f5299108e9
branches:  trunk
changeset: 344660:81f5299108e9
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Apr 10 15:41:05 2016 +0000

description:
GC PAX_ASLR_EXEC

diffstat:

 sys/kern/kern_pax.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 8390e5e13c62 -r 81f5299108e9 sys/kern/kern_pax.c
--- a/sys/kern/kern_pax.c       Sun Apr 10 15:39:27 2016 +0000
+++ b/sys/kern/kern_pax.c       Sun Apr 10 15:41:05 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_pax.c,v 1.40 2016/04/10 15:26:18 christos Exp $   */
+/*     $NetBSD: kern_pax.c,v 1.41 2016/04/10 15:41:05 christos Exp $   */
 
 /*
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.40 2016/04/10 15:26:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.41 2016/04/10 15:41:05 christos Exp $");
 
 #include "opt_pax.h"
 
@@ -137,8 +137,7 @@
 /* flag set means disable */
 int pax_aslr_flags;
 #define PAX_ASLR_STACK 1
-#define PAX_ASLR_EXEC  2
-#define PAX_ASLR_MMAP  4
+#define PAX_ASLR_MMAP  2
 #endif
 
 static int pax_segvguard_enabled = 1;