From f59a9cb554a8dfcbe13c8a0775542ee7a0d8a353 Mon Sep 17 00:00:00 2001 From: Alexander Potapenko Date: Thu, 16 May 2019 11:07:33 +0200 Subject: Rebuild upstream-kmsan.config Turns out I was using a stale KASAN config which didn't include TOMOYO bits. --- dashboard/config/upstream-kmsan.config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'dashboard') 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 -- cgit mrf-deployment