aboutsummaryrefslogtreecommitdiffstats
path: root/dashboard
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2019-05-15 11:57:17 +0200
committerDmitry Vyukov <dvyukov@google.com>2019-05-15 11:57:17 +0200
commit3345130d0ff55e38f6a00f98fd796d433d915a0e (patch)
tree74546bd4c7e3d5efaca4a73b77ad6b480049ef0d /dashboard
parent22c391e19520a3ae3fbfd5be51ce63df4d2e21c2 (diff)
dashboard/config: fix up TOMOYO configs
See https://groups.google.com/d/msg/syzkaller/mODXmnauUZM/nIuyd2M0AAAJ for context.
Diffstat (limited to 'dashboard')
-rw-r--r--dashboard/config/upstream-kasan.config4
1 files changed, 3 insertions, 1 deletions
diff --git a/dashboard/config/upstream-kasan.config b/dashboard/config/upstream-kasan.config
index c0f054de8..673d6fa62 100644
--- a/dashboard/config/upstream-kasan.config
+++ b/dashboard/config/upstream-kasan.config
@@ -5598,7 +5598,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_TOMOYO_INSECURE_BUILTIN_SETTING=y
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_APPARMOR_HASH=y