Module Name: src
Committed By: jym
Date: Thu Dec 17 23:53:24 UTC 2009
Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0 XEN3_DOMU
src/sys/arch/i386/conf: XEN3_DOM0 XEN3_DOMU
Log Message:
Compile in PaX support for Xen x86 kernels (dom0 and domU).
ok bou...@. Compiled and tested by me under i386. Only compile tested for
amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/i386/conf/XEN3_DOMU
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.47 src/sys/arch/amd64/conf/XEN3_DOM0:1.48
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.47 Sat Dec 5 20:11:03 2009
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Thu Dec 17 23:53:24 2009
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.47 2009/12/05 20:11:03 pooka Exp $
+# $NetBSD: XEN3_DOM0,v 1.48 2009/12/17 23:53:24 jym Exp $
include "arch/amd64/conf/std.xen"
@@ -808,3 +808,6 @@
pseudo-device xenevt
pseudo-device xvif
pseudo-device xbdback
+
+options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
+options PAX_ASLR=0 # PaX Address Space Layout Randomization
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.20 src/sys/arch/amd64/conf/XEN3_DOMU:1.21
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.20 Sat Dec 5 20:11:03 2009
+++ src/sys/arch/amd64/conf/XEN3_DOMU Thu Dec 17 23:53:24 2009
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.20 2009/12/05 20:11:03 pooka Exp $
+# $NetBSD: XEN3_DOMU,v 1.21 2009/12/17 23:53:24 jym Exp $
include "arch/amd64/conf/std.xen"
@@ -213,6 +213,9 @@
#pseudo-device pf # PF packet filter
#pseudo-device pflog # PF log if
+options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
+options PAX_ASLR=0 # PaX Address Space Layout Randomization
+
# miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals
pseudo-device rnd # /dev/random and in-kernel generator
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.23 src/sys/arch/i386/conf/XEN3_DOM0:1.24
--- src/sys/arch/i386/conf/XEN3_DOM0:1.23 Sat Dec 5 20:11:15 2009
+++ src/sys/arch/i386/conf/XEN3_DOM0 Thu Dec 17 23:53:24 2009
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.23 2009/12/05 20:11:15 pooka Exp $
+# $NetBSD: XEN3_DOM0,v 1.24 2009/12/17 23:53:24 jym Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -799,6 +799,9 @@
pseudo-device xvif
pseudo-device xbdback
+options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
+options PAX_ASLR=0 # PaX Address Space Layout Randomization
+
ppb* at pci? dev ? function ? # PCI-PCI bridges
pci* at ppb? bus ?
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.19 src/sys/arch/i386/conf/XEN3_DOMU:1.20
--- src/sys/arch/i386/conf/XEN3_DOMU:1.19 Sat Dec 5 20:11:15 2009
+++ src/sys/arch/i386/conf/XEN3_DOMU Thu Dec 17 23:53:24 2009
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.19 2009/12/05 20:11:15 pooka Exp $
+# $NetBSD: XEN3_DOMU,v 1.20 2009/12/17 23:53:24 jym Exp $
include "arch/xen/conf/std.xen"
@@ -247,6 +247,9 @@
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device drvctl
+options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
+options PAX_ASLR=0 # PaX Address Space Layout Randomization
+
# PCI pass-through support:
#xpci* at xenbus ? #Xen3 PCI front end driver
#pci* at xpci ?
