arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-08-01 03:18:12 +00:00
Code Issues Releases Wiki Activity

setup: move stack smashing protection code to setup.c

Browse Source
This commit is contained in:
Pavol Rusnak 2017-07-26 16:50:52 +02:00
parent e33e1ec0b1
commit 0760ff0468
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bootloader/bootloader.c
View File

@ -120,13 +120,7 @@ void bootloader_loop(void)
usbLoop(firmware_present()); usbLoop(firmware_present());
} }
uint32_t __stack_chk_guard; extern uint32_t __stack_chk_guard;
void __attribute__((noreturn)) __stack_chk_fail(void)
{
layoutDialog(&bmp_icon_error, NULL, NULL, NULL, "Stack smashing", "detected.", NULL, "Please unplug", "the device.", NULL);
for (;;) {} // loop forever
}
int main(void) int main(void)
{ {

8
firmware/trezor.c
View File

@ -31,13 +31,7 @@
#include "buttons.h" #include "buttons.h"
#include "fastflash.h" #include "fastflash.h"
uint32_t __stack_chk_guard; extern uint32_t __stack_chk_guard;
void __attribute__((noreturn)) __stack_chk_fail(void)
{
layoutDialog(&bmp_icon_error, NULL, NULL, NULL, "Stack smashing", "detected.", NULL, "Please unplug", "the device.", NULL);
for (;;) {} // loop forever
}
void check_lock_screen(void) void check_lock_screen(void)
{ {

10
setup.c
View File

@ -21,7 +21,17 @@
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/spi.h> #include <libopencm3/stm32/spi.h>
#include <libopencm3/stm32/f2/rng.h> #include <libopencm3/stm32/f2/rng.h>
#include "rng.h" #include "rng.h"
#include "layout.h"
uint32_t __stack_chk_guard;
void __attribute__((noreturn)) __stack_chk_fail(void)
{
layoutDialog(&bmp_icon_error, NULL, NULL, NULL, "Stack smashing", "detected.", NULL, "Please unplug", "the device.", NULL);
for (;;) {} // loop forever
}
void setup(void) void setup(void)
{ {