aboutsummaryrefslogtreecommitdiffstats
path: root/dashboard
diff options
context:
space:
mode:
authorAlexander Potapenko <glider@google.com>2019-05-16 11:07:33 +0200
committerDmitry Vyukov <dvyukov@google.com>2019-05-16 11:10:34 +0200
commitf59a9cb554a8dfcbe13c8a0775542ee7a0d8a353 (patch)
tree0ee3c1fe4f1a6e40298077cea03c0589a8df73aa /dashboard
parent051c49fe0d110e04d94a6187796996fec349fe60 (diff)
Rebuild upstream-kmsan.config
Turns out I was using a stale KASAN config which didn't include TOMOYO bits.
Diffstat (limited to 'dashboard')
-rw-r--r--dashboard/config/upstream-kmsan.config5
1 files changed, 4 insertions, 1 deletions
diff --git a/dashboard/config/upstream-kmsan.config b/dashboard/config/upstream-kmsan.config
index 74b0870d2..1e3c1aa12 100644
--- a/dashboard/config/upstream-kmsan.config
+++ b/dashboard/config/upstream-kmsan.config
@@ -1828,6 +1828,7 @@ CONFIG_PCIEASPM_DEFAULT=y
CONFIG_PCIE_PME=y
# CONFIG_PCIE_DPC is not set
# CONFIG_PCIE_PTM is not set
+# CONFIG_PCIE_BW is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_MSI_IRQ_DOMAIN=y
CONFIG_PCI_QUIRKS=y
@@ -7092,7 +7093,9 @@ CONFIG_SECURITY_SMACK_NETFILTER=y
CONFIG_SECURITY_TOMOYO=y
CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=1024
CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=32
-CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER=y
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_APPARMOR_HASH=y
CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y