From d1baf2f47063e58b159aad8ec4e58bd0cb2fbbfd Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Wed, 20 Oct 2021 07:20:57 +0000 Subject: dashboard/config/linux: support back-ported KASAN_STACK{_ENABLE} rename in Android KASAN_STACK_ENABLE was renamed to KASAN_STACK in kernel version v5.11. This change was also back-ported to android12-5.10, so we need to provide support for that here too or else `make configs` will complain that KASAN_STACK_ENABLE is not enabled. Signed-off-by: Lee Jones --- AUTHORS | 1 + CONTRIBUTORS | 2 ++ dashboard/config/linux/bits/android.yml | 3 +++ 3 files changed, 6 insertions(+) diff --git a/AUTHORS b/AUTHORS index 635b25450..c0c5804dc 100644 --- a/AUTHORS +++ b/AUTHORS @@ -46,3 +46,4 @@ Microsoft Corporation Muhammad Usama Anjum ANSSI Chuck Silvers +Lee Jones diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 08bc3898a..d83ee9b4f 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -97,3 +97,5 @@ ANSSI Desmond Cheong Zhi Xi Chuck Silvers Pavel Skripkin +Linaro + Lee Jones diff --git a/dashboard/config/linux/bits/android.yml b/dashboard/config/linux/bits/android.yml index f93d782ed..eacac8a0c 100644 --- a/dashboard/config/linux/bits/android.yml +++ b/dashboard/config/linux/bits/android.yml @@ -7,3 +7,6 @@ config: # gki_defconfig defaults to KERNEL_LZ4, but we don't have lz4 installed, # and the package lz4 is not available on the syzbot distros. - KERNEL_GZIP + # Android has back-ported the KASAN_STACK_ENABLE => KASAN_STACK rename from v5.11 + - KASAN_STACK_ENABLE: [n, v5.10, override] + - KASAN_STACK: [v5.10, override] -- cgit mrf-deployment