summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Makefile.inc18
-rw-r--r--src/lib/asan.c32
2 files changed, 43 insertions, 7 deletions
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index e33a44998c..4ce133a336 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -7,16 +7,24 @@ ramstage-y += ubsan.c
CFLAGS_ramstage += -fsanitize=undefined
endif
-ifeq ($(CONFIG_ASAN_IN_RAMSTAGE),y)
-ramstage-y += asan.c
# 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-stack=1 -fsanitize-address-use-after-scope \
--param asan-instrumentation-with-call-threshold=0 \
- -fsanitize-address-use-after-scope \
--param use-after-scope-direct-emission-threshold=0
-CFLAGS_ramstage += $(CFLAGS_asan)
+
+ifeq ($(CONFIG_ASAN_IN_ROMSTAGE),y)
+romstage-y += asan.c
+CFLAGS_asan += --param asan-globals=0
+CFLAGS_romstage += $(CFLAGS_asan)
# Allow memory access without __asan_load and __asan_store checks.
+$(obj)/romstage/lib/asan.o: CFLAGS_asan =
+endif
+
+ifeq ($(CONFIG_ASAN_IN_RAMSTAGE),y)
+ramstage-y += asan.c
+CFLAGS_asan += --param asan-globals=1
+CFLAGS_ramstage += $(CFLAGS_asan)
$(obj)/ramstage/lib/asan.o: CFLAGS_asan =
endif
diff --git a/src/lib/asan.c b/src/lib/asan.c
index 0c186d62a3..11dbf7c657 100644
--- a/src/lib/asan.c
+++ b/src/lib/asan.c
@@ -10,18 +10,29 @@
#include <symbols.h>
#include <assert.h>
+#include <arch/symbols.h>
#include <asan.h>
static inline void *asan_mem_to_shadow(const void *addr)
{
+#if ENV_ROMSTAGE
+ return (void *)((uintptr_t)&_asan_shadow + (((uintptr_t)addr -
+ (uintptr_t)&_car_region_start) >> ASAN_SHADOW_SCALE_SHIFT));
+#elif ENV_RAMSTAGE
return (void *)((uintptr_t)&_asan_shadow + (((uintptr_t)addr -
(uintptr_t)&_data) >> ASAN_SHADOW_SCALE_SHIFT));
+#endif
}
static inline const void *asan_shadow_to_mem(const void *shadow_addr)
{
+#if ENV_ROMSTAGE
+ return (void *)((uintptr_t)&_car_region_start + (((uintptr_t)shadow_addr -
+ (uintptr_t)&_asan_shadow) << ASAN_SHADOW_SCALE_SHIFT));
+#elif ENV_RAMSTAGE
return (void *)((uintptr_t)&_data + (((uintptr_t)shadow_addr -
(uintptr_t)&_asan_shadow) << ASAN_SHADOW_SCALE_SHIFT));
+#endif
}
static void asan_poison_shadow(const void *address, size_t size, u8 value)
@@ -225,10 +236,15 @@ static __always_inline void check_memory_region_inline(unsigned long addr,
size_t size, bool write,
unsigned long ret_ip)
{
+#if ENV_ROMSTAGE
+ if (((uintptr_t)addr < (uintptr_t)&_car_region_start) ||
+ ((uintptr_t)addr > (uintptr_t)&_ebss))
+ return;
+#elif ENV_RAMSTAGE
if (((uintptr_t)addr < (uintptr_t)&_data) ||
- ((uintptr_t)addr > (uintptr_t)&_eheap))
+ ((uintptr_t)addr > (uintptr_t)&_eheap))
return;
-
+#endif
if (unlikely(size == 0))
return;
@@ -252,8 +268,13 @@ static void check_memory_region(unsigned long addr, size_t size, bool write,
uintptr_t __asan_shadow_offset(uintptr_t addr)
{
+#if ENV_ROMSTAGE
+ return (uintptr_t)&_asan_shadow - (((uintptr_t)&_car_region_start) >>
+ ASAN_SHADOW_SCALE_SHIFT);
+#elif ENV_RAMSTAGE
return (uintptr_t)&_asan_shadow - (((uintptr_t)&_data) >>
ASAN_SHADOW_SCALE_SHIFT);
+#endif
}
static void register_global(struct asan_global *global)
@@ -285,6 +306,7 @@ void __asan_unregister_globals(struct asan_global *globals, size_t size)
* to it so we could poison variable's redzone.
* This function calls those constructors.
*/
+#if ENV_RAMSTAGE
static void asan_ctors(void)
{
extern long __CTOR_LIST__;
@@ -296,12 +318,18 @@ static void asan_ctors(void)
for (; *ctor != (func_ptr) 0; ctor++)
(*ctor)();
}
+#endif
void asan_init(void)
{
+#if ENV_ROMSTAGE
+ size_t size = (size_t)&_ebss - (size_t)&_car_region_start;
+ asan_unpoison_shadow((void *)&_car_region_start, size);
+#elif ENV_RAMSTAGE
size_t size = (size_t)&_eheap - (size_t)&_data;
asan_unpoison_shadow((void *)&_data, size);
asan_ctors();
+#endif
}
void __asan_poison_stack_memory(const void *addr, size_t size)