From 88250aee0f2ad81f49ea13da4410ceae261e3cfa Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Thu, 21 Jul 2022 09:47:16 +0000 Subject: dashboard/config: disable CONFIG_HARDEN_BRANCH_PREDICTOR for arm32 Linux Closes #3249. --- dashboard/config/linux/bits/arm.yml | 3 +++ dashboard/config/linux/upstream-arm-full-base.config | 2 +- dashboard/config/linux/upstream-arm-full.config | 2 +- dashboard/config/linux/upstream-arm-kasan-base.config | 2 +- dashboard/config/linux/upstream-arm-kasan.config | 2 +- dashboard/config/linux/upstream-kmsan-base.config | 4 +++- dashboard/config/linux/upstream-kmsan.config | 4 +++- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dashboard/config/linux/bits/arm.yml b/dashboard/config/linux/bits/arm.yml index a187b3ced..da9bda68b 100644 --- a/dashboard/config/linux/bits/arm.yml +++ b/dashboard/config/linux/bits/arm.yml @@ -52,3 +52,6 @@ config: - BINFMT_SHARED_FLAT - CAN_KVASER_PCIEFD: [-baseline, -onlyusb] - CRC_T10DIF + # Otherwise fuzzing on arm32 is currently hindered due to the "BUG: using smp_processor_id() in preemptible code" bug. + # See https://github.com/google/syzkaller/issues/3249 + - HARDEN_BRANCH_PREDICTOR: n diff --git a/dashboard/config/linux/upstream-arm-full-base.config b/dashboard/config/linux/upstream-arm-full-base.config index 89e7c3a43..10cc04ea0 100644 --- a/dashboard/config/linux/upstream-arm-full-base.config +++ b/dashboard/config/linux/upstream-arm-full-base.config @@ -385,7 +385,7 @@ CONFIG_SWP_EMULATE=y # CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND is not set # CONFIG_CPU_BPREDICT_DISABLE is not set CONFIG_CPU_SPECTRE=y -CONFIG_HARDEN_BRANCH_PREDICTOR=y +# CONFIG_HARDEN_BRANCH_PREDICTOR is not set CONFIG_HARDEN_BRANCH_HISTORY=y CONFIG_KUSER_HELPERS=y CONFIG_VDSO=y diff --git a/dashboard/config/linux/upstream-arm-full.config b/dashboard/config/linux/upstream-arm-full.config index 221dff79e..eb635a27d 100644 --- a/dashboard/config/linux/upstream-arm-full.config +++ b/dashboard/config/linux/upstream-arm-full.config @@ -434,7 +434,7 @@ CONFIG_SWP_EMULATE=y # CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND is not set # CONFIG_CPU_BPREDICT_DISABLE is not set CONFIG_CPU_SPECTRE=y -CONFIG_HARDEN_BRANCH_PREDICTOR=y +# CONFIG_HARDEN_BRANCH_PREDICTOR is not set CONFIG_HARDEN_BRANCH_HISTORY=y CONFIG_KUSER_HELPERS=y CONFIG_VDSO=y diff --git a/dashboard/config/linux/upstream-arm-kasan-base.config b/dashboard/config/linux/upstream-arm-kasan-base.config index b6b6a7588..53a0465aa 100644 --- a/dashboard/config/linux/upstream-arm-kasan-base.config +++ b/dashboard/config/linux/upstream-arm-kasan-base.config @@ -385,7 +385,7 @@ CONFIG_SWP_EMULATE=y # CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND is not set # CONFIG_CPU_BPREDICT_DISABLE is not set CONFIG_CPU_SPECTRE=y -CONFIG_HARDEN_BRANCH_PREDICTOR=y +# CONFIG_HARDEN_BRANCH_PREDICTOR is not set CONFIG_HARDEN_BRANCH_HISTORY=y CONFIG_KUSER_HELPERS=y CONFIG_VDSO=y diff --git a/dashboard/config/linux/upstream-arm-kasan.config b/dashboard/config/linux/upstream-arm-kasan.config index 3ad7db583..b998788d5 100644 --- a/dashboard/config/linux/upstream-arm-kasan.config +++ b/dashboard/config/linux/upstream-arm-kasan.config @@ -434,7 +434,7 @@ CONFIG_SWP_EMULATE=y # CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND is not set # CONFIG_CPU_BPREDICT_DISABLE is not set CONFIG_CPU_SPECTRE=y -CONFIG_HARDEN_BRANCH_PREDICTOR=y +# CONFIG_HARDEN_BRANCH_PREDICTOR is not set CONFIG_HARDEN_BRANCH_HISTORY=y CONFIG_KUSER_HELPERS=y CONFIG_VDSO=y diff --git a/dashboard/config/linux/upstream-kmsan-base.config b/dashboard/config/linux/upstream-kmsan-base.config index b563dbf35..2993bdea5 100644 --- a/dashboard/config/linux/upstream-kmsan-base.config +++ b/dashboard/config/linux/upstream-kmsan-base.config @@ -5,7 +5,7 @@ # Automatically generated file; DO NOT EDIT. # Linux/x86_64 5.18.0-rc4 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="clang version 15.0.0 (https://github.com/llvm/llvm-project.git 9ffb5944a699b6a0d69c169ceff97636395ee30f)" +CONFIG_CC_VERSION_TEXT="clang version 15.0.0 (https://github.com/llvm/llvm-project.git 610139d2d9ce6746b3c617fb3e2f7886272d26ff)" CONFIG_GCC_VERSION=0 CONFIG_CC_IS_CLANG=y CONFIG_CLANG_VERSION=150000 @@ -327,6 +327,8 @@ CONFIG_X86_FEATURE_NAMES=y CONFIG_X86_MPPARSE=y # CONFIG_GOLDFISH is not set # CONFIG_RETPOLINE is not set +CONFIG_CC_HAS_SLS=y +# CONFIG_SLS is not set # CONFIG_X86_CPU_RESCTRL is not set CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_VSMP is not set diff --git a/dashboard/config/linux/upstream-kmsan.config b/dashboard/config/linux/upstream-kmsan.config index a762397c2..d31e01842 100644 --- a/dashboard/config/linux/upstream-kmsan.config +++ b/dashboard/config/linux/upstream-kmsan.config @@ -5,7 +5,7 @@ # Automatically generated file; DO NOT EDIT. # Linux/x86_64 5.18.0-rc4 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="clang version 15.0.0 (https://github.com/llvm/llvm-project.git 9ffb5944a699b6a0d69c169ceff97636395ee30f)" +CONFIG_CC_VERSION_TEXT="clang version 15.0.0 (https://github.com/llvm/llvm-project.git 610139d2d9ce6746b3c617fb3e2f7886272d26ff)" CONFIG_GCC_VERSION=0 CONFIG_CC_IS_CLANG=y CONFIG_CLANG_VERSION=150000 @@ -340,6 +340,8 @@ CONFIG_X86_FEATURE_NAMES=y CONFIG_X86_MPPARSE=y # CONFIG_GOLDFISH is not set # CONFIG_RETPOLINE is not set +CONFIG_CC_HAS_SLS=y +# CONFIG_SLS is not set # CONFIG_X86_CPU_RESCTRL is not set CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_VSMP is not set -- cgit mrf-deployment