Compile in by default (disabled) PaX ASLR for amd64 and i386.

This commit is contained in:
elad 2007-12-26 23:00:50 +00:00
parent 0287baacad
commit b1111e85d4
2 changed files with 8 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.190 2007/12/26 16:28:17 joerg Exp $
# $NetBSD: GENERIC,v 1.191 2007/12/26 23:00:50 elad Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.190 $"
#ident "GENERIC-$Revision: 1.191 $"
maxusers 32 # estimated number of users
@ -1068,4 +1068,5 @@ options VERIFIED_EXEC_FP_SHA512
options VERIFIED_EXEC_FP_SHA1
options VERIFIED_EXEC_FP_MD5
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
options PAX_ASLR=0 # PaX Address Space Layout Randomization

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.871 2007/12/26 16:28:15 joerg Exp $
# $NetBSD: GENERIC,v 1.872 2007/12/26 23:00:51 elad Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.871 $"
#ident "GENERIC-$Revision: 1.872 $"
maxusers 32 # estimated number of users
@ -1500,4 +1500,5 @@ options VERIFIED_EXEC_FP_SHA512
options VERIFIED_EXEC_FP_SHA1
options VERIFIED_EXEC_FP_MD5
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
options PAX_ASLR=0 # PaX Address Space Layout Randomization