diff options
| author | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-03-29 11:27:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-29 11:27:36 +0100 |
| commit | 79c0f525abf91cb963a3aa8476ddafbf22f4fe2e (patch) | |
| tree | b5acd1e8a6ed0ae49e0521f52e20b307c3f58ef6 /plat/qemu | |
| parent | bd79727c93dec36153451b4c85b0c79172df7d40 (diff) | |
| parent | f68d22e8796524f36acf9feb6ffcc16cb1fc75d2 (diff) | |
Merge pull request #1325 from michpappas/tf-issues#568_qemu_add_ENABLE_STACK_PROTECTOR
qemu: Add support for stack canary protection
Diffstat (limited to 'plat/qemu')
| -rw-r--r-- | plat/qemu/include/platform_def.h | 4 | ||||
| -rw-r--r-- | plat/qemu/platform.mk | 4 | ||||
| -rw-r--r-- | plat/qemu/qemu_stack_protector.c | 23 |
3 files changed, 29 insertions, 2 deletions
diff --git a/plat/qemu/include/platform_def.h b/plat/qemu/include/platform_def.h index f8764fbf..2f2ca6f1 100644 --- a/plat/qemu/include/platform_def.h +++ b/plat/qemu/include/platform_def.h @@ -75,7 +75,7 @@ #define NS_DRAM0_SIZE 0x3de00000 #define SEC_SRAM_BASE 0x0e000000 -#define SEC_SRAM_SIZE 0x00040000 +#define SEC_SRAM_SIZE 0x00060000 #define SEC_DRAM_BASE 0x0e100000 #define SEC_DRAM_SIZE 0x00f00000 @@ -123,7 +123,7 @@ * Put BL2 just below BL3-1. BL2_BASE is calculated using the current BL2 debug * size plus a little space for growth. */ -#define BL2_BASE (BL31_BASE - 0x1D000) +#define BL2_BASE (BL31_BASE - 0x25000) #define BL2_LIMIT BL31_BASE /* diff --git a/plat/qemu/platform.mk b/plat/qemu/platform.mk index 017807b0..379ab3dc 100644 --- a/plat/qemu/platform.mk +++ b/plat/qemu/platform.mk @@ -169,6 +169,10 @@ $(eval $(call TOOL_ADD_IMG,bl32_extra2,--tos-fw-extra2)) endif SEPARATE_CODE_AND_RODATA := 1 +ENABLE_STACK_PROTECTOR := 0 +ifneq ($(ENABLE_STACK_PROTECTOR), 0) + PLAT_BL_COMMON_SOURCES += plat/qemu/qemu_stack_protector.c +endif # Use MULTI_CONSOLE_API by default only on AArch64 # as it is not yet supported on AArch32 diff --git a/plat/qemu/qemu_stack_protector.c b/plat/qemu/qemu_stack_protector.c new file mode 100644 index 00000000..5b198283 --- /dev/null +++ b/plat/qemu/qemu_stack_protector.c @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <arch_helpers.h> +#include <platform.h> +#include <stdint.h> + +#define RANDOM_CANARY_VALUE ((u_register_t) 3288484550995823360ULL) + +u_register_t plat_get_stack_protector_canary(void) +{ + /* + * Ideally, a random number should be returned instead of the + * combination of a timer's value and a compile-time constant. + * As the virt platform does not have any random number generator, + * this is better than nothing but not necessarily really secure. + */ + return RANDOM_CANARY_VALUE ^ read_cntpct_el0(); +} + |