[hal] rtos: add defaults for configENABLE_HEAP_PROTECTOR, add canary …

…hook for gen3
particle-iot · Jun 28, 2024 · 6d1d9bf · 6d1d9bf
1 parent 29433d3
commit 6d1d9bf
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 0 deletions.
diff --git a/hal/src/nRF52840/freertos/FreeRTOSConfig.h b/hal/src/nRF52840/freertos/FreeRTOSConfig.h
@@ -140,6 +140,7 @@ extern void vApplicationTaskDeleteHook(void *pvTaskToDelete, volatile long* pxPe
 #define configDYNAMIC_HEAP_SIZE     ( 1 )
 #define configUSE_MALLOC_FAILED_HOOK ( 1 )
 #define configSUPPORT_STATIC_ALLOCATION ( 1 )
+#define configENABLE_HEAP_PROTECTOR (0) // TODO: enable
 
 /* Co-routine definitions. */
 #define configUSE_CO_ROUTINES       0

diff --git a/hal/src/nRF52840/rtos_hook.cpp b/hal/src/nRF52840/rtos_hook.cpp
@@ -117,4 +117,11 @@ void vApplicationIdleHook(void) {
     }
 }
 
+#if defined(configENABLE_HEAP_PROTECTOR) && configENABLE_HEAP_PROTECTOR == 1
+void vApplicationGetRandomHeapCanary( portPOINTER_SIZE_TYPE * pxHeapCanary ) {
+    uint32_t canary = HAL_RNG_GetRandomNumber();
+    *pxHeapCanary = canary;
+}
+#endif // defined(configENABLE_HEAP_PROTECTOR) && configENABLE_HEAP_PROTECTOR == 1
+
 } // extern "C"
diff --git a/hal/src/rtl872x/freertos/FreeRTOSConfig.h b/hal/src/rtl872x/freertos/FreeRTOSConfig.h
@@ -111,6 +111,8 @@ extern void vApplicationTaskDeleteHook(void *pvTaskToDelete, volatile long* pxPe
 #define secureconfigTOTAL_SRAM_HEAP_SIZE			( ( ( size_t ) ( 6 * 1024 ) ) )
 #define secureconfigTOTAL_PSRAM_HEAP_SIZE			( ( ( size_t ) ( 128 * 1024 ) ) )
 
+#define configENABLE_HEAP_PROTECTOR                     (0) // TODO: enable
+
 /* Constants that build features in or out. */
 #define configUSE_MUTEXES								1
 #define configMUTEX_MULTI_STEP_PRIORITY_DISINHERITANCE  1

diff --git a/hal/src/rtl872x/freertos/FreeRTOSConfig_m23.h b/hal/src/rtl872x/freertos/FreeRTOSConfig_m23.h
@@ -82,6 +82,7 @@ extern uint32_t SystemCoreClock;
 #define configDYNAMIC_HEAP_SIZE                         ( 1 )
 #define configHEAP_NO_ASSERT_OVERRIDE                   ( 1 )
 #define configSUPPORT_STATIC_ALLOCATION					( 1 )
+#define configENABLE_HEAP_PROTECTOR                     (0) // TODO: enable
 
 /* Constants that build features in or out. */
 #define configUSE_MUTEXES								1

diff --git a/hal/src/rtl872x/rtos_hook.cpp b/hal/src/rtl872x/rtos_hook.cpp
@@ -120,9 +120,11 @@ void vApplicationIdleHook(void) {
     }
 }
 
+#if defined(configENABLE_HEAP_PROTECTOR) && configENABLE_HEAP_PROTECTOR == 1
 void vApplicationGetRandomHeapCanary( portPOINTER_SIZE_TYPE * pxHeapCanary ) {
     uint32_t canary = HAL_RNG_GetRandomNumber();
     *pxHeapCanary = canary;
 }
+#endif // defined(configENABLE_HEAP_PROTECTOR) && configENABLE_HEAP_PROTECTOR == 1
 
 } // extern "C"