diff options
-rw-r--r-- | src/Kconfig | 5 | ||||
-rw-r--r-- | src/lib/Makefile.inc | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/Kconfig b/src/Kconfig index 1540c567e4..f8af522823 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -283,6 +283,11 @@ config ASAN_IN_RAMSTAGE If unsure, say N. +if ASAN_IN_RAMSTAGE + comment "Before using this feature, make sure that " + comment "asan_shadow_offset_callback patch is applied to GCC." +endif + choice prompt "Stage Cache for ACPI S3 resume" default NO_STAGE_CACHE if !HAVE_ACPI_RESUME diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 0b4342764f..e33a44998c 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -9,7 +9,8 @@ endif ifeq ($(CONFIG_ASAN_IN_RAMSTAGE),y) ramstage-y += asan.c -CFLAGS_asan += -fsanitize=kernel-address \ +# Ensure that asan_shadow_offset_callback patch is applied to GCC before ASan is used. +CFLAGS_asan += -fsanitize=kernel-address --param asan-use-shadow-offset-callback=1 \ --param asan-stack=1 --param asan-globals=1 \ --param asan-instrumentation-with-call-threshold=0 \ -fsanitize-address-use-after-scope \ |