From 7ff2d092910b1741a45eaed8b03e8d560aad70fa Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Thu, 18 Jan 2024 10:36:46 -0800 Subject: [PATCH] v: 6.6: Replace DEBUG_LIST with BUG_ON_DATA_CORRUPTION ...which selects LIST_HARDENED. This is enough to catch list corruption issues that would allow for some classic exploitation primitives without regressing performance. Refer to [1] for throughput perf data when only selecting LIST_HARDENED over DEBUG_LIST. [1] https://lore.kernel.org/all/20230811151847.1594958-3-elver@google.com/ Bug: 311450232 Change-Id: I5069b338e8988aba9fd650a9828d2cb0625f971f Signed-off-by: Will McVicker --- v/android-6.6/android-base.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v/android-6.6/android-base.config b/v/android-6.6/android-base.config index 8bf9f1b..c6ada04 100644 --- a/v/android-6.6/android-base.config +++ b/v/android-6.6/android-base.config @@ -28,6 +28,7 @@ CONFIG_BLK_INLINE_ENCRYPTION=y CONFIG_BLOCK=y CONFIG_BPF_JIT=y CONFIG_BPF_SYSCALL=y +CONFIG_BUG_ON_DATA_CORRUPTION=y CONFIG_CC_IS_CLANG=y CONFIG_CGROUPS=y CONFIG_CGROUP_BPF=y @@ -52,7 +53,6 @@ CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_XCBC=y -CONFIG_DEBUG_LIST=y CONFIG_DEFAULT_SECURITY_SELINUX=y CONFIG_DM_DEFAULT_KEY=y CONFIG_DM_SNAPSHOT=y