commit 05e13bac2c5a0c035b51e5e9513d4a59a966ce5e
author Ken Liu <ken.liu@arm.com> Sat Jul 25 10:31:33 2020 +0800
committer Soby Mathew <soby.mathew@arm.com> Fri Oct 16 17:02:07 2020 +0100
tree 46b3c15b8510faa5f403061272c5d35cae0b57e1
parent 50e21099d0eb360ce2aad52192f8db6a8b7a137d

Stack_seal_mitigation: Secure harden the Main Stack Pointer (MSP)

Seal the MSP_S for both IPC mode and Library mode with the recommended
stack seal value during runtime. Check the comments in the header
file for more details.

Change-Id: Icc36f318d5416aa2c3df8b4d647d892caddd20c3
Signed-off-by: Ken Liu <ken.liu@arm.com>

secure_fw/spm/cmsis_psa/arch/tfm_arch_v6m_v7m.h

diff --git a/secure_fw/spm/cmsis_psa/arch/tfm_arch_v6m_v7m.h b/secure_fw/spm/cmsis_psa/arch/tfm_arch_v6m_v7m.h
index 380df16..77d7806 100644
--- a/secure_fw/spm/cmsis_psa/arch/tfm_arch_v6m_v7m.h
+++ b/secure_fw/spm/cmsis_psa/arch/tfm_arch_v6m_v7m.h
@@ -107,11 +107,11 @@
 }
 
 /**
- * \brief Set MSP limit value.
+ * \brief Secure the MSP
  *
  * \param[in] msplim        MSP limit value to be written.
  */
-__STATIC_INLINE void tfm_arch_set_msplim(uint32_t msplim)
+__STATIC_INLINE void tfm_arch_init_secure_msp(uint32_t msplim)
 {
     /*
      * Defined as an empty function now.

secure_fw/spm/cmsis_psa/main.c

diff --git a/secure_fw/spm/cmsis_psa/main.c b/secure_fw/spm/cmsis_psa/main.c
index 5bea871..6ddec00 100644
--- a/secure_fw/spm/cmsis_psa/main.c
+++ b/secure_fw/spm/cmsis_psa/main.c
@@ -119,7 +119,7 @@
 int main(void)
 {
     /* set Main Stack Pointer limit */
-    tfm_arch_set_msplim((uint32_t)&REGION_NAME(Image$$, ARM_LIB_STACK_MSP,
+    tfm_arch_init_secure_msp((uint32_t)&REGION_NAME(Image$$, ARM_LIB_STACK_MSP,
                                                $$ZI$$Base));
 
     if (tfm_core_init() != TFM_SUCCESS) {

secure_fw/spm/cmsis_psa/spm_ipc.c

diff --git a/secure_fw/spm/cmsis_psa/spm_ipc.c b/secure_fw/spm/cmsis_psa/spm_ipc.c
index 66626c9..deebf3d 100644
--- a/secure_fw/spm/cmsis_psa/spm_ipc.c
+++ b/secure_fw/spm/cmsis_psa/spm_ipc.c
@@ -941,7 +941,7 @@
          */
         stacked_ctx_pos = (uintptr_t)p_ctx +
                           sizeof(struct tfm_state_context_t) +
-                          TFM_VENEER_STACK_GUARD_SIZE;
+                          TFM_STACK_SEALED_SIZE;
 
         if (is_stack_alloc_fp_space(exc_return)) {
 #if defined (__FPU_USED) && (__FPU_USED == 1U)