Skip to content

Commit

Permalink
core: print "TEE load address" message on abort
Browse files Browse the repository at this point in the history
Commit 02d307b ("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: 02d307b ("core: use libunw")
Signed-off-by: Jerome Forissier <[email protected]>
Reviewed-by: Jens Wiklander <[email protected]>
  • Loading branch information
jforissier committed Nov 17, 2020
1 parent 685d152 commit 24d52e4
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion core/arch/arm/kernel/abort.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 24d52e4

Please sign in to comment.