fix

Author: theamirocohen

api/src/uvisor-input.S

@@ -114,8 +114,8 @@ uvisor_config:
     /* Debug driver pointer */
     .long __uvisor_debug_driver
 
-    /* Stack limit for publix box MSPLIM_NS */
-    .long __StackLimit
+    /* Stack limit for publix box MSPLIM_NS, accessed by public_box_stack_limit */
+    .long __uvisor_public_box_stack_limit
 
 /* uVisor mode of operation
  * Modes available: UVISOR_ENABLED, UVISOR_DISABLED, UVISOR_PERMISSIVE. */
@@ -137,6 +137,9 @@ __uvisor_debug_driver:
     .long 0
     .long 0
 
+__uvisor_public_box_stack_limit:
+    .long __StackLimit
+
 /* __uvisor_ps is written inside uvisor_init. It must not be
  * overwritten by libc init and therefore is placed in .uninitialized. */
 .section .uninitialized

core/system/inc/linker.h

@@ -122,7 +122,7 @@ typedef struct {
 
     TUvisorDebugDriver const * const debug_driver;
 
-    /* Stack limit for MSPNS_LIM - __StackLimit from uvisor-input*/
+    /* Stack limit for public box MSPNS_LIM, accessed by __uvisor_public_box_stack_limit*/
     uint32_t * public_box_stack_limit;
 } UVISOR_PACKED UvisorConfig;
 

core/system/src/main.c

@@ -162,7 +162,7 @@ void main_init(void)
     __TZ_set_MSP_NS(original_sp);
 
     /* NS P limit, for the RTOS and the uVisor-ns. */
-    __TZ_set_MSPLIM_NS((uint32_t)(__uvisor_config.public_box_stack_limit));
+    __TZ_set_MSPLIM_NS(*(__uvisor_config.public_box_stack_limit));
 
     /* S NP stack pointer, for the SDSs and the transition gateways. */
     __set_PSP((uint32_t) &__uvisor_stack_top_np__);