arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-25 16:08:32 +00:00
Code Issues Releases Wiki Activity

feat(core): improve post mortem info for secure fault

Browse Source 
[no changelog]
This commit is contained in:
cepetr 2025-05-12 08:06:45 +02:00 committed by cepetr
parent 05acc1599b
commit 5b537103bd
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/embed/sys/task/inc/sys/systask.h
View File

@ -44,6 +44,12 @@ typedef struct {
uint32_t mmfar; uint32_t mmfar;
// Address associated with the BusFault // Address associated with the BusFault
uint32_t bfar; uint32_t bfar;
#if defined(__ARM_FEATURE_CMSE)
// Secure Fault Status Register
uint32_t sfsr;
// Address associated with the SecureFault
uint32_t sfar;
#endif
// Stack pointer at the time of the fault // Stack pointer at the time of the fault
// (MSP or PSP depending on the privilege level) // (MSP or PSP depending on the privilege level)
uint32_t sp; uint32_t sp;

6
core/embed/sys/task/stm32/systask.c
View File

@ -93,7 +93,7 @@ void systask_scheduler_init(systask_error_handler_t error_handler) {
#if defined(__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) #if defined(__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
// Enable SecureFault handler // Enable SecureFault handler
SCB->SHCSR |= SCB_SHCSR_SECUREFAULTENA_Msk; SCB->SHCSR |= SCB_SHCSR_SECUREFAULTENA_Msk;
#endif #endif
} }
systask_t* systask_active(void) { systask_t* systask_active(void) {
@ -380,6 +380,10 @@ __attribute((used)) static void systask_exit_fault(bool privileged,
pminfo->fault.mmfar = SCB->MMFAR; pminfo->fault.mmfar = SCB->MMFAR;
pminfo->fault.bfar = SCB->BFAR; pminfo->fault.bfar = SCB->BFAR;
pminfo->fault.hfsr = SCB->HFSR; pminfo->fault.hfsr = SCB->HFSR;
#if defined(__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
pminfo->fault.sfsr = SAU->SFSR;
pminfo->fault.sfar = SAU->SFAR;
#endif
} }
systask_kill(task); systask_kill(task);