arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-03-28 22:15:42 +00:00
Code Issues Releases Wiki Activity

fix bootloader stack protector fault

Browse Source
This commit is contained in:
mruddy 2017-06-30 13:49:30 -04:00 committed by Pavol Rusnak
parent 0f42f64dfd
commit f274d8cd73
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bootloader/bootloader.c
View File

@ -76,12 +76,15 @@ void show_unofficial_warning(const uint8_t *hash)
// everything is OK, user pressed 2x Continue -> continue program // everything is OK, user pressed 2x Continue -> continue program
} }
void load_app(void) void __attribute__((noreturn)) load_app(void)
{ {
// jump to app // jump to app
SCB_VTOR = FLASH_APP_START; // & 0xFFFF; SCB_VTOR = FLASH_APP_START; // & 0xFFFF;
__asm__ volatile("msr msp, %0"::"g" (*(volatile uint32_t *)FLASH_APP_START)); __asm__ volatile("msr msp, %0"::"g" (*(volatile uint32_t *)FLASH_APP_START));
(*(void (**)())(FLASH_APP_START + 4))(); (*(void (**)())(FLASH_APP_START + 4))();
// forever loop to indicate to the compiler that this function does not return.
// this avoids the stack protector injecting code that faults with the new stack.
for (;;);
} }
bool firmware_present(void) bool firmware_present(void)