diff options
author | Julius Werner <jwerner@chromium.org> | 2016-03-07 17:55:43 -0800 |
---|---|---|
committer | Martin Roth <martinroth@google.com> | 2016-03-09 17:07:14 +0100 |
commit | fffee873c86f88a8a4b92fd9d2e16dc3f6dc7133 (patch) | |
tree | bf53b2c51c68659965822a039246adb25f7c9baa /src/arch | |
parent | 0819a47d14e8c933dab7089a41625f043778a4c7 (diff) |
Makefile: Add build-time overlap check for programs loaded after coreboot
On non-x86 platforms, coreboot uses the memlayout.ld mechanism to
statically allocate the different memory regions it needs and guarantees
at build time that there are no dangerous overlaps between them. At the
end of its (ramstage) execution, however, it usually loads a payload
(and possibly other platform-specific components) that is not integrated
into the coreboot build system and therefore cannot provide the same
overlap guarantees through memlayout.ld. This creates a dangerous memory
hazard where a new component could be loaded over memory areas that are
still in use by the code-loading ramstage and lead to arbitrary memory
corruption bugs.
This patch fills this gap in our build-time correctness guarantees by
adding the necessary checks as a new intermediate Makefile target on
route to assembling the final image. It will parse the memory footprint
information of the payload (and other platform-specific post-ramstage
components) from CBFS and compare it to a list of memory areas known to
be still in use during late ramstage, generating a build failure in case
of a possible hazard.
BUG=chrome-os-partner:48008
TEST=Built Oak while moving critical regions in the way of BL31 or the
payload, observing the desired build-time errors. Built Nyan, Jerry and
Falco without issues for good measure.
Change-Id: I3ebd2c1caa4df959421265e26f9cab2c54909b68
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/13949
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/arch')
-rw-r--r-- | src/arch/arm/Makefile.inc | 4 | ||||
-rw-r--r-- | src/arch/arm64/Makefile.inc | 8 | ||||
-rw-r--r-- | src/arch/mips/Makefile.inc | 4 | ||||
-rw-r--r-- | src/arch/riscv/Makefile.inc | 4 |
4 files changed, 20 insertions, 0 deletions
diff --git a/src/arch/arm/Makefile.inc b/src/arch/arm/Makefile.inc index b04a3dbd12..d9c88c0db0 100644 --- a/src/arch/arm/Makefile.inc +++ b/src/arch/arm/Makefile.inc @@ -25,6 +25,10 @@ ifeq ($(CONFIG_ARCH_ROMSTAGE_ARM),y) CBFSTOOL_PRE1_OPTS = -m arm -s $(CONFIG_CBFS_SIZE) endif +ifeq ($(CONFIG_ARCH_RAMSTAGE_ARM),y) +check-ramstage-overlap-regions += postram_cbfs_cache stack ttb +endif + ifeq ($(CONFIG_ARCH_ARM),y) subdirs-y += libgcc/ subdirs-y += armv4/ armv7/ diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc index f44ee51f36..dffdd9cd2e 100644 --- a/src/arch/arm64/Makefile.inc +++ b/src/arch/arm64/Makefile.inc @@ -33,6 +33,10 @@ ifeq ($(CONFIG_ARCH_ROMSTAGE_ARM64),y) CBFSTOOL_PRE1_OPTS = -m arm64 -s $(CONFIG_CBFS_SIZE) endif +ifeq ($(CONFIG_ARCH_RAMSTAGE_ARM64),y) +check-ramstage-overlap-regions += postram_cbfs_cache stack ttb +endif + ################################################################################ # bootblock ################################################################################ @@ -182,6 +186,8 @@ $(BL31_CBFS)-type := stage $(BL31_CBFS)-compression := $(CBFS_COMPRESS_FLAG) cbfs-files-y += $(BL31_CBFS) +check-ramstage-overlap-files += $(BL31_CBFS) + ifeq ($(CONFIG_ARM64_USE_SECURE_OS),y) SECURE_OS_FILE := $(CONFIG_ARM64_SECURE_OS_FILE) @@ -190,6 +196,8 @@ $(SECURE_OS_FILE_CBFS)-file := $(SECURE_OS_FILE) $(SECURE_OS_FILE_CBFS)-type := stage cbfs-files-y += $(SECURE_OS_FILE_CBFS) +check-ramstage-overlap-files += $(SECURE_OS_FILE_CBFS) + endif # CONFIG_ARM64_USE_SECURE_OS endif # CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE diff --git a/src/arch/mips/Makefile.inc b/src/arch/mips/Makefile.inc index a037525419..0901388221 100644 --- a/src/arch/mips/Makefile.inc +++ b/src/arch/mips/Makefile.inc @@ -22,6 +22,10 @@ ifeq ($(CONFIG_ARCH_ROMSTAGE_MIPS),y) CBFSTOOL_PRE1_OPTS = -m mips -s $(CONFIG_CBFS_SIZE) endif +ifeq ($(CONFIG_ARCH_RAMSTAGE_MIPS),y) +check-ramstage-overlap-regions += stack +endif + ############################################################################### # bootblock ############################################################################### diff --git a/src/arch/riscv/Makefile.inc b/src/arch/riscv/Makefile.inc index 2d4d7e6c25..4abaf586d9 100644 --- a/src/arch/riscv/Makefile.inc +++ b/src/arch/riscv/Makefile.inc @@ -19,6 +19,10 @@ riscv_flags = -I$(src)/arch/riscv/ riscv_asm_flags = +ifeq ($(CONFIG_ARCH_RAMSTAGE_RISCV),y) +check-ramstage-overlap-regions += stack +endif + ################################################################################ ## bootblock ################################################################################ |