summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/NOTES7
-rw-r--r--sys/conf/files1
-rw-r--r--sys/conf/options3
3 files changed, 11 insertions, 0 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 0f9cdb5..fee10b5 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -309,6 +309,13 @@ options GDB
options SYSCTL_DEBUG
#
+# DEBUG_MEMGUARD builds and enables memguard(9), a replacement allocator
+# for the kernel used to detect modify-after-free scenarios. See the
+# memguard(9) man page for more information on usage.
+#
+options DEBUG_MEMGUARD
+
+#
# KTRACE enables the system-call tracing facility ktrace(2). To be more
# SMP-friendly, KTRACE uses a worker thread to process most trace events
# asynchronously to the thread generating the event. This requires a
diff --git a/sys/conf/files b/sys/conf/files
index 95c5011..90a8d48 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1702,6 +1702,7 @@ vm/swap_pager.c standard
vm/uma_core.c standard
vm/uma_dbg.c standard
vm/vm_contig.c standard
+vm/memguard.c optional DEBUG_MEMGUARD
vm/vm_fault.c standard
vm/vm_glue.c standard
vm/vm_init.c standard
diff --git a/sys/conf/options b/sys/conf/options
index 8398bd7..1c9ec6e 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -515,6 +515,9 @@ PQ_LARGECACHE opt_vmpage.h
PQ_HUGECACHE opt_vmpage.h
PQ_CACHESIZE opt_vmpage.h
+# The MemGuard replacement allocator used for tamper-after-free detection
+DEBUG_MEMGUARD opt_vm.h
+
# Standard SMP options
SMP opt_global.h
OpenPOWER on IntegriCloud