diff options
| author | Space Meyer <spm@google.com> | 2022-11-14 11:46:00 +0000 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2022-11-14 15:03:01 +0100 |
| commit | 15e1da7b57c0124b38fe07ff4aa86a55a1a065f9 (patch) | |
| tree | a94971f4fa7a95e204be068919b53a197cbc8661 | |
| parent | 5e29b30f257ceeecfbf677fe0243cf616449d7be (diff) | |
dashboard/config: move android 5.10 specifics out of android.yml
See discussion here about why this affected android 5.4:
https://github.com/google/syzkaller/pull/3518#issuecomment-1313533618
| -rw-r--r-- | dashboard/config/linux/android-5.4-base.config | 4 | ||||
| -rw-r--r-- | dashboard/config/linux/android-5.4.config | 4 | ||||
| -rw-r--r-- | dashboard/config/linux/bits/android-5.10.yml | 4 | ||||
| -rw-r--r-- | dashboard/config/linux/bits/android.yml | 3 |
4 files changed, 8 insertions, 7 deletions
diff --git a/dashboard/config/linux/android-5.4-base.config b/dashboard/config/linux/android-5.4-base.config index 5f9dfb3f8..8548cc515 100644 --- a/dashboard/config/linux/android-5.4-base.config +++ b/dashboard/config/linux/android-5.4-base.config @@ -5836,8 +5836,8 @@ CONFIG_KASAN=y CONFIG_KASAN_GENERIC=y # CONFIG_KASAN_OUTLINE is not set CONFIG_KASAN_INLINE=y -# CONFIG_KASAN_STACK_ENABLE is not set -CONFIG_KASAN_STACK=0 +CONFIG_KASAN_STACK_ENABLE=y +CONFIG_KASAN_STACK=1 # CONFIG_TEST_KASAN is not set # end of Memory Debugging diff --git a/dashboard/config/linux/android-5.4.config b/dashboard/config/linux/android-5.4.config index 382eb3670..d924d5bcd 100644 --- a/dashboard/config/linux/android-5.4.config +++ b/dashboard/config/linux/android-5.4.config @@ -6636,8 +6636,8 @@ CONFIG_KASAN=y CONFIG_KASAN_GENERIC=y # CONFIG_KASAN_OUTLINE is not set CONFIG_KASAN_INLINE=y -# CONFIG_KASAN_STACK_ENABLE is not set -CONFIG_KASAN_STACK=0 +CONFIG_KASAN_STACK_ENABLE=y +CONFIG_KASAN_STACK=1 # CONFIG_TEST_KASAN is not set # end of Memory Debugging diff --git a/dashboard/config/linux/bits/android-5.10.yml b/dashboard/config/linux/bits/android-5.10.yml index 66f1b52e2..f427496fc 100644 --- a/dashboard/config/linux/bits/android-5.10.yml +++ b/dashboard/config/linux/bits/android-5.10.yml @@ -29,3 +29,7 @@ config: # None of these have been marked with 'Fixes' or cc'ed to stable, so it is very # unlikely that these are going to be fixed in 5.10 stable kernel. - IO_URING: n + + # Android has back-ported the KASAN_STACK_ENABLE => KASAN_STACK rename from v5.11 + - KASAN_STACK_ENABLE: [n, override] + - KASAN_STACK: [override] diff --git a/dashboard/config/linux/bits/android.yml b/dashboard/config/linux/bits/android.yml index 949c0c3d1..d591caf14 100644 --- a/dashboard/config/linux/bits/android.yml +++ b/dashboard/config/linux/bits/android.yml @@ -9,8 +9,5 @@ config: - KERNEL_GZIP # gki_defconfig uses these settings - CMDLINE: [append, "cgroup_disable=pressure cgroup.memory=nokmem"] - # 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] # Disable -Werror for -Wframe-larger-than' warning - KVM_WERROR: n |