riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sys/ssp: use a random value as the canary

Browse Source 
This implements the randomization of canary values on each build as
mentioned in the comment above the STACK_CHK_GUARD macro. The canary
value is generated by the buildsystem and passed to the ssp module using
a `-D` compiler flag. The ssp object file, using this canary value, is
marked as PHONY to make sure it is rebuild on each make invocation,
thereby ensuring that each build uses a new random canary value.

Implementing this properly would require generating a cryptographically
secure random value on each boot of the RIOT operating system. This is
not deemed possible on some constrained devices, e.g. due to lack of
hardware random number generators. Besides, RIOT only seems to support a
PRNG (random module) currently. While this may be implemented in the
future for some devices the changes implemented in this commit may still
be used as a fallback then.

A hardcoded canary value is used when building software on the CI to not
break the CI test cache [1].

[1]: https://github.com/RIOT-OS/RIOT/pull/13119#issuecomment-574132932
This commit is contained in:
Sören Tempel 2020-01-14 11:14:39 +01:00
parent 1e52ac21e4
commit dbd5b4a402
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/ssp/Makefile
View File

@ -1 +1,17 @@
# module name is used below, thus set explicitly
MODULE = ssp
ifeq (,$(RIOT_CI_BUILD))
# random canary value newly generated on each build
CANARY := $(shell $(RIOTTOOLS)/randhex/randhex.py)
else
# hardcoded canary value to not break CI test cache
CANARY := 0xdeadbeef
endif
# pass the generated canary using a macro and mark the object file using
# it as PHONY to ensure that a new canary value is used on each build.
CFLAGS += -DSTACK_CHK_GUARD=$(CANARY)U
.PHONY: $(BINDIR)/$(MODULE)/$(MODULE).o
include $(RIOTBASE)/Makefile.base

3
sys/ssp/ssp.c
View File

@ -22,9 +22,6 @@
#include "panic.h"
/* this should be randomized for each build */
#define STACK_CHK_GUARD 0x595e9fbd94fda766
uintptr_t __stack_chk_guard = (uintptr_t) STACK_CHK_GUARD;
__attribute__((noreturn)) void __stack_chk_fail(void)