Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow PAX_ASLR to be used by itself.

This commit is contained in:
matt 2011-06-23 23:42:43 +00:00
parent 2fa13d153a
commit 65bd0920b3
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/conf/files
View File

@ -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.c
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

8
sys/kern/exec_subr.c
View File

@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.68 2011/03/04 04:25:58 christos Exp
#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>

8
sys/uvm/uvm_mmap.c
View File

@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.136 2011/06/12 03:36:03 rmind Exp $")
#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>