arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-11 16:00:57 +00:00
Code Issues Releases Wiki Activity

fix(core & legacy): avoid accidental build with broken stack protector

Browse Source
This commit is contained in:
Ondrej Mikle 2021-06-02 16:25:25 +02:00
parent cb6934a490
commit 6b849b1d4d
4 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/embed/bootloader/main.c
View File

@ -36,6 +36,20 @@
#include "messages.h"
// #include "mpu.h"
/*
* Avoid accidental build with gcc versions having broken stack protector 9.2.1 - 10.2
*/
#if defined(__GNUC__) && !defined(__llvm__)
#define GCC_VERSION (__GNUC__ * 10000 \
+ __GNUC_MINOR__ * 100 \
+ __GNUC_PATCHLEVEL__)
#if GCC_VERSION >= 90201 && GCC_VERSION <= 100200
#error "ARM GCC versions 9.2.1 - 10.2 have broken stack smash protector, preventing build"
#endif
#endif
const uint8_t BOOTLOADER_KEY_M = 2;
const uint8_t BOOTLOADER_KEY_N = 3;
static const uint8_t * const BOOTLOADER_KEYS[] = {

14
core/embed/firmware/main.c
View File

@ -53,6 +53,20 @@
// from util.s
extern void shutdown_privileged(void);
/*
* Avoid accidental build with gcc versions having broken stack protector 9.2.1 - 10.2
*/
#if defined(__GNUC__) && !defined(__llvm__)
#define GCC_VERSION (__GNUC__ * 10000 \
+ __GNUC_MINOR__ * 100 \
+ __GNUC_PATCHLEVEL__)
#if GCC_VERSION >= 90201 && GCC_VERSION <= 100200
#error "ARM GCC versions 9.2.1 - 10.2 have broken stack smash protector, preventing build"
#endif
#endif
int main(void) {
random_delays_init();

14
legacy/bootloader/bootloader.c
View File

@ -35,6 +35,20 @@
#include "usb.h"
#include "util.h"
/*
* Avoid accidental build with gcc versions having broken stack protector 9.2.1 - 10.2
*/
#if defined(__GNUC__) && !defined(__llvm__)
#define GCC_VERSION (__GNUC__ * 10000 \
+ __GNUC_MINOR__ * 100 \
+ __GNUC_PATCHLEVEL__)
#if GCC_VERSION >= 90201 && GCC_VERSION <= 100200
#error "ARM GCC versions 9.2.1 - 10.2 have broken stack smash protector, preventing build"
#endif
#endif
void layoutFirmwareFingerprint(const uint8_t *hash) {
char str[4][17] = {0};
for (int i = 0; i < 4; i++) {

14
legacy/firmware/trezor.c
View File

@ -38,6 +38,20 @@
#include "otp.h"
#endif
/*
* Avoid accidental build with gcc versions having broken stack protector 9.2.1 - 10.2
*/
#if defined(__GNUC__) && !defined(__llvm__)
#define GCC_VERSION (__GNUC__ * 10000 \
+ __GNUC_MINOR__ * 100 \
+ __GNUC_PATCHLEVEL__)
#if GCC_VERSION >= 90201 && GCC_VERSION <= 100200
#error "ARM GCC versions 9.2.1 - 10.2 have broken stack smash protector, preventing build"
#endif
#endif
/* Screen timeout */
uint32_t system_millis_lock_start = 0;