Merge remote-tracking branch 'origin/master' into next

[ipfire-2.x.git] / config / etc / sysctl.conf

diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf
index ad562404fb5f92857f8b4186cff40da57d28811c..46ab4e1d4ad9850958c0e665411aadc4529a50a7 100644 (file)
--- a/config/etc/sysctl.conf
+++ b/config/etc/sysctl.conf
@@ -24,7 +24,7 @@ net.ipv4.conf.all.accept_source_route = 0
 net.ipv4.conf.all.log_martians = 1
 
 kernel.printk = 1 4 1 7
-vm.swappiness=0
+vm.swappiness=1
 vm.mmap_min_addr = 4096
 vm.min_free_kbytes = 8192
 
@@ -39,3 +39,9 @@ net.netfilter.nf_conntrack_acct=1
 net.bridge.bridge-nf-call-ip6tables = 0
 net.bridge.bridge-nf-call-iptables = 0
 net.bridge.bridge-nf-call-arptables = 0
+
+# Try to keep kernel address exposures out of various /proc files (kallsyms, modules, etc).
+kernel.kptr_restrict = 2
+
+# Avoid kernel memory address exposures via dmesg.
+kernel.dmesg_restrict = 1