aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2018-09-28 10:13:53 +0200
committerDmitry Vyukov <dvyukov@google.com>2018-09-28 14:57:20 +0200
commit746df66f2ceb2a5a4bf9114d64bf6beba8ecc7f8 (patch)
treec249b8e9a5fc65380cf10d7eb8b0214d48b5509c
parent8bb1f0fce104dcb8346b2c57542535658ce9e76e (diff)
dashboard/config: disable CONFIG_DYNAMIC_DEBUG and CONFIG_BPFILTER
syzkaller manages to turn on dynamic debug messages somehow, which then produces tons of output on console. Disable dynamic debug on kasan. Disable bpfilter on kmsan as we already did on kasan.
-rw-r--r--dashboard/config/upstream-kasan.config2
-rw-r--r--dashboard/config/upstream-kmsan.config5
2 files changed, 3 insertions, 4 deletions
diff --git a/dashboard/config/upstream-kasan.config b/dashboard/config/upstream-kasan.config
index a18cf95df..20f5fd614 100644
--- a/dashboard/config/upstream-kasan.config
+++ b/dashboard/config/upstream-kasan.config
@@ -5886,7 +5886,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_DYNAMIC_DEBUG=y
+# CONFIG_DYNAMIC_DEBUG is not set
#
# Compile-time checks and compiler options
diff --git a/dashboard/config/upstream-kmsan.config b/dashboard/config/upstream-kmsan.config
index 6e63d636f..6dde353a8 100644
--- a/dashboard/config/upstream-kmsan.config
+++ b/dashboard/config/upstream-kmsan.config
@@ -9,7 +9,7 @@ CONFIG_DEBUG_MEMORY=y
CONFIG_DEBUG_AID_FOR_SYZBOT=y
#
-# Compiler: clang version 8.0.0 (trunk 341642)
+# Compiler: clang version 8.0.0 (trunk 339414)
#
CONFIG_GCC_VERSION=0
CONFIG_CC_IS_CLANG=y
@@ -1410,8 +1410,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=y
CONFIG_BRIDGE_EBT_SNAT=y
CONFIG_BRIDGE_EBT_LOG=y
CONFIG_BRIDGE_EBT_NFLOG=y
-CONFIG_BPFILTER=y
-CONFIG_BPFILTER_UMH=y
+# CONFIG_BPFILTER is not set
CONFIG_IP_DCCP=y
CONFIG_INET_DCCP_DIAG=y