summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorJerome Forissier <jerome@forissier.org>2020-11-16 16:12:45 +0100
committerJérôme Forissier <jerome@forissier.org>2020-11-17 10:44:32 +0100
commit24d52e47de1177a6a62e818cc5b326d9b02bfdfe (patch)
tree67baf2a44e13c9d252cd343d212a8f143145c363 /core
parent685d1524a26d01490cc1a20d1a78f23ce985a80a (diff)
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 <jerome@forissier.org> Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Diffstat (limited to 'core')
-rw-r--r--core/arch/arm/kernel/abort.c7
1 files changed, 6 insertions, 1 deletions
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 <arm.h>
#include <kernel/abort.h>
+#include <kernel/linker.h>
#include <kernel/misc.h>
#include <kernel/panic.h>
#include <kernel/tee_ta_manager.h>
@@ -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)