Module Name: src Committed By: matt Date: Thu Jun 23 23:42:44 UTC 2011
Modified Files: src/sys/conf: files src/sys/kern: exec_subr.c src/sys/uvm: uvm_mmap.c Log Message: Allow PAX_ASLR to be used by itself. To generate a diff of this commit: cvs rdiff -u -r1.1016 -r1.1017 src/sys/conf/files cvs rdiff -u -r1.68 -r1.69 src/sys/kern/exec_subr.c cvs rdiff -u -r1.136 -r1.137 src/sys/uvm/uvm_mmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1016 src/sys/conf/files:1.1017 --- src/sys/conf/files:1.1016 Sat May 28 19:30:19 2011 +++ src/sys/conf/files Thu Jun 23 23:42:43 2011 @@ -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 Index: src/sys/kern/exec_subr.c diff -u src/sys/kern/exec_subr.c:1.68 src/sys/kern/exec_subr.c:1.69 --- src/sys/kern/exec_subr.c:1.68 Fri Mar 4 04:25:58 2011 +++ src/sys/kern/exec_subr.c Thu Jun 23 23:42:44 2011 @@ -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> Index: src/sys/uvm/uvm_mmap.c diff -u src/sys/uvm/uvm_mmap.c:1.136 src/sys/uvm/uvm_mmap.c:1.137 --- src/sys/uvm/uvm_mmap.c:1.136 Sun Jun 12 03:36:03 2011 +++ src/sys/uvm/uvm_mmap.c Thu Jun 23 23:42:44 2011 @@ -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>