From 24d52e47de1177a6a62e818cc5b326d9b02bfdfe Mon Sep 17 00:00:00 2001 From: Jerome Forissier Date: Mon, 16 Nov 2020 16:12:45 +0100 Subject: core: print "TEE load address" message on abort Commit 02d307b7db90 ("core: use libunw") has involuntarily removed the "TEE load address @ ..." message when a TEE core abort occurs. This information is essential to be able to resolve function addresses when ASLR is enabled, and scripts/symbolize.py needs this line. Add it back. Fixes: 02d307b7db90 ("core: use libunw") Signed-off-by: Jerome Forissier Reviewed-by: Jens Wiklander --- core/arch/arm/kernel/abort.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/arch/arm/kernel/abort.c b/core/arch/arm/kernel/abort.c index c64367f5..675f515c 100644 --- a/core/arch/arm/kernel/abort.c +++ b/core/arch/arm/kernel/abort.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -217,8 +218,12 @@ static void __abort_print(struct abort_info *ai, bool stack_dump) __print_abort_info(ai, "Core"); - if (stack_dump) + if (stack_dump) { + trace_printf_helper_raw(TRACE_ERROR, true, + "TEE load address @ %#"PRIxVA, + VCORE_START_VA); __print_stack_unwind(ai); + } } void abort_print(struct abort_info *ai) -- cgit v1.2.3