build.config.kasan: explicitly use KASAN_OUTLINE

Due to a bug in lib/Kconfig.kasan, we have been using KASAN_OUTLINE implicitly for KASAN image builds. In preparation for fixing the bug in lib/Kconfig.kasan, we now need to explicitly use KASAN_OUTLINE in the KASAN build config. This change originates from: commit 5931159 ("kasan: fix instrumentation modes choice config") Author: Andrey Konovalov <[email protected]> but it needed to be split into build.config change and Kconfig change. Change-Id: Ie3b9816343fc6a00e4b21f6ef4aace03d46113bc Signed-off-by: Petri Gynther <[email protected]>
theaeonsolution · Nov 8, 2019 · 0d1fd7b · 0d1fd7b
1 parent ff8a6db
commit 0d1fd7b
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/build.config.kasan b/build.config.kasan
@@ -5,12 +5,11 @@ POST_DEFCONFIG_CMDS="check_defconfig && update_kasan_config"
 function update_kasan_config() {
     ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
          -e CONFIG_KASAN \
-         -e CONFIG_KASAN_INLINE \
+         -e CONFIG_KASAN_OUTLINE \
          -e CONFIG_KASAN_PANIC_ON_WARN \
          -e CONFIG_TEST_KASAN \
          -e CONFIG_KCOV \
          -e CONFIG_SLUB \
-         -d CONFIG_KASAN_OUTLINE \
          -d CONFIG_RANDOMIZE_BASE \
          -d CONFIG_CC_WERROR \
          --set-val CONFIG_FRAME_WARN 0 \