[src/trunk]: src/sys Allow PAX_ASLR to be used by itself.

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

details:   https://anonhg.NetBSD.org/src/rev/d5bfb804bc85
branches:  trunk
changeset: 766492:d5bfb804bc85
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Jun 23 23:42:43 2011 +0000

description:
Allow PAX_ASLR to be used by itself.

diffstat:

 sys/conf/files       |  4 ++--
 sys/kern/exec_subr.c |  8 ++++----
 sys/uvm/uvm_mmap.c   |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diffs (78 lines):

diff -r 32d6dbbe9aba -r d5bfb804bc85 sys/conf/files
--- a/sys/conf/files    Thu Jun 23 22:50:53 2011 +0000
+++ b/sys/conf/files    Thu Jun 23 23:42:43 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.1016 2011/05/28 19:30:19 matt Exp $
+#      $NetBSD: files,v 1.1017 2011/06/23 23:42:43 matt Exp $
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
 version        20100430
@@ -1480,7 +1480,7 @@
 file   kern/kern_mutex_obj.c
 file   kern/kern_fileassoc.c           fileassoc
 file   kern/kern_ntptime.c
-file   kern/kern_pax.c                 pax_mprotect | pax_segvguard
+file   kern/kern_pax.c                 pax_mprotect | pax_segvguard | pax_aslr
 file   kern/kern_physio.c
 file   kern/kern_pmf.c
 file   kern/kern_proc.c
diff -r 32d6dbbe9aba -r d5bfb804bc85 sys/kern/exec_subr.c
--- a/sys/kern/exec_subr.c      Thu Jun 23 22:50:53 2011 +0000
+++ b/sys/kern/exec_subr.c      Thu Jun 23 23:42:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exec_subr.c,v 1.68 2011/03/04 04:25:58 christos Exp $  */
+/*     $NetBSD: exec_subr.c,v 1.69 2011/06/23 23:42:44 matt Exp $      */
 
 /*
  * Copyright (c) 1993, 1994, 1996 Christopher G. Demetriou
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.68 2011/03/04 04:25:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.69 2011/06/23 23:42:44 matt Exp $");
 
 #include "opt_pax.h"
 
@@ -46,9 +46,9 @@
 #include <sys/resourcevar.h>
 #include <sys/device.h>
 
-#ifdef PAX_MPROTECT
+#if defined(PAX_ASLR) || defined(PAX_MPROTECT)
 #include <sys/pax.h>
-#endif /* PAX_MPROTECT */
+#endif /* PAX_ASLR || PAX_MPROTECT */
 
 #include <uvm/uvm_extern.h>
 
diff -r 32d6dbbe9aba -r d5bfb804bc85 sys/uvm/uvm_mmap.c
--- a/sys/uvm/uvm_mmap.c        Thu Jun 23 22:50:53 2011 +0000
+++ b/sys/uvm/uvm_mmap.c        Thu Jun 23 23:42:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_mmap.c,v 1.136 2011/06/12 03:36:03 rmind Exp $     */
+/*     $NetBSD: uvm_mmap.c,v 1.137 2011/06/23 23:42:44 matt Exp $      */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.136 2011/06/12 03:36:03 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.137 2011/06/23 23:42:44 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_pax.h"
@@ -67,9 +67,9 @@
 #include <sys/verified_exec.h>
 #endif /* NVERIEXEC > 0 */
  
-#ifdef PAX_MPROTECT
+#if defined(PAX_ASLR) || defined(PAX_MPROTECT)
 #include <sys/pax.h>
-#endif /* PAX_MPROTECT */
+#endif /* PAX_ASLR || PAX_MPROTECT */
 
 #include <miscfs/specfs/specdev.h>