diff options
author | Christoph Müllner <christophm30@gmail.com> | 2020-11-20 22:06:16 +0100 |
---|---|---|
committer | Christoph Müllner <christophm30@gmail.com> | 2020-12-01 11:54:57 +0100 |
commit | 826ba363c46cbd7fce906d542c91e399802e16aa (patch) | |
tree | e77f9e1fbbe99ca275cba73bb69aa23380d3bb78 /plat/rockchip | |
parent | 9acf5736216ae0d6fc5a904d5e431588867641ae (diff) | |
download | trusted-firmware-a-826ba363c46cbd7fce906d542c91e399802e16aa.tar.gz |
rockchip: Add support for the stack protector
It uses the system timer as "entropy" source in the same
way as QEMU, layerscape and others.
Change-Id: Icda17b78e85255bea96109ca2ee0e091187d62ac
Signed-off-by: Christoph Müllner <christophm30@gmail.com>
Diffstat (limited to 'plat/rockchip')
-rw-r--r-- | plat/rockchip/common/rockchip_stack_protector.c | 24 | ||||
-rw-r--r-- | plat/rockchip/px30/platform.mk | 4 | ||||
-rw-r--r-- | plat/rockchip/rk3328/platform.mk | 4 | ||||
-rw-r--r-- | plat/rockchip/rk3368/platform.mk | 4 | ||||
-rw-r--r-- | plat/rockchip/rk3399/platform.mk | 4 |
5 files changed, 40 insertions, 0 deletions
diff --git a/plat/rockchip/common/rockchip_stack_protector.c b/plat/rockchip/common/rockchip_stack_protector.c new file mode 100644 index 0000000000..18989779ee --- /dev/null +++ b/plat/rockchip/common/rockchip_stack_protector.c @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <stdint.h> + +#include <arch_helpers.h> +#include <plat/common/platform.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(); +} + diff --git a/plat/rockchip/px30/platform.mk b/plat/rockchip/px30/platform.mk index 87cf18704a..b1bb80701f 100644 --- a/plat/rockchip/px30/platform.mk +++ b/plat/rockchip/px30/platform.mk @@ -36,6 +36,10 @@ PLAT_BL_COMMON_SOURCES := lib/bl_aux_params/bl_aux_params.c \ lib/xlat_tables/aarch64/xlat_tables.c \ plat/common/plat_psci_common.c +ifneq (${ENABLE_STACK_PROTECTOR},0) +PLAT_BL_COMMON_SOURCES += ${RK_PLAT_COMMON}/rockchip_stack_protector.c +endif + BL31_SOURCES += ${RK_GIC_SOURCES} \ common/desc_image_load.c \ drivers/arm/cci/cci.c \ diff --git a/plat/rockchip/rk3328/platform.mk b/plat/rockchip/rk3328/platform.mk index 0219422f93..5a307e4915 100644 --- a/plat/rockchip/rk3328/platform.mk +++ b/plat/rockchip/rk3328/platform.mk @@ -35,6 +35,10 @@ PLAT_BL_COMMON_SOURCES := common/desc_image_load.c \ plat/common/aarch64/crash_console_helpers.S \ plat/common/plat_psci_common.c +ifneq (${ENABLE_STACK_PROTECTOR},0) +PLAT_BL_COMMON_SOURCES += ${RK_PLAT_COMMON}/rockchip_stack_protector.c +endif + BL31_SOURCES += ${RK_GIC_SOURCES} \ drivers/arm/cci/cci.c \ drivers/ti/uart/aarch64/16550_console.S \ diff --git a/plat/rockchip/rk3368/platform.mk b/plat/rockchip/rk3368/platform.mk index cb0cb89625..e78729357b 100644 --- a/plat/rockchip/rk3368/platform.mk +++ b/plat/rockchip/rk3368/platform.mk @@ -33,6 +33,10 @@ PLAT_BL_COMMON_SOURCES := common/desc_image_load.c \ plat/common/aarch64/crash_console_helpers.S \ plat/common/plat_psci_common.c +ifneq (${ENABLE_STACK_PROTECTOR},0) +PLAT_BL_COMMON_SOURCES += ${RK_PLAT_COMMON}/rockchip_stack_protector.c +endif + BL31_SOURCES += ${RK_GIC_SOURCES} \ drivers/arm/cci/cci.c \ drivers/ti/uart/aarch64/16550_console.S \ diff --git a/plat/rockchip/rk3399/platform.mk b/plat/rockchip/rk3399/platform.mk index a658fb2868..aba67c2fe3 100644 --- a/plat/rockchip/rk3399/platform.mk +++ b/plat/rockchip/rk3399/platform.mk @@ -38,6 +38,10 @@ PLAT_BL_COMMON_SOURCES := common/desc_image_load.c \ plat/common/aarch64/crash_console_helpers.S \ plat/common/plat_psci_common.c +ifneq (${ENABLE_STACK_PROTECTOR},0) +PLAT_BL_COMMON_SOURCES += ${RK_PLAT_COMMON}/rockchip_stack_protector.c +endif + BL31_SOURCES += ${RK_GIC_SOURCES} \ drivers/arm/cci/cci.c \ drivers/ti/uart/aarch64/16550_console.S \ |