feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

fix(freertos): Use ESP_EARLY_LOGE in vPortTLSPointersDelCb for RISCV

Browse Source 
Using ESP_LOG* in this function causes a crash
This commit is contained in:
John Boiles
2025-05-28 10:48:08 -07:00
committed by armando
parent dc814f241a
commit 6287650225
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/freertos/FreeRTOS-Kernel-SMP/portable/riscv/port.c
View File

@@ -252,7 +252,7 @@ static void vPortTLSPointersDelCb( void *pxTCB )
if ( pvThreadLocalStoragePointersDelCallback[ x ] != NULL ) { //If del cb is set if ( pvThreadLocalStoragePointersDelCallback[ x ] != NULL ) { //If del cb is set
/* In case the TLSP deletion callback has been overwritten by a TLS pointer, gracefully abort. */ /* In case the TLSP deletion callback has been overwritten by a TLS pointer, gracefully abort. */
if ( !esp_ptr_executable( pvThreadLocalStoragePointersDelCallback[ x ] ) ) { if ( !esp_ptr_executable( pvThreadLocalStoragePointersDelCallback[ x ] ) ) {
ESP_LOGE("FreeRTOS", "Fatal error: TLSP deletion callback at index %d overwritten with non-excutable pointer %p", x, pvThreadLocalStoragePointersDelCallback[ x ]); ESP_EARLY_LOGE("FreeRTOS", "Fatal error: TLSP deletion callback at index %d overwritten with non-excutable pointer %p", x, pvThreadLocalStoragePointersDelCallback[ x ]);
abort(); abort();
} }

2
components/freertos/FreeRTOS-Kernel/portable/riscv/port.c
View File

@@ -714,7 +714,7 @@ static void vPortTLSPointersDelCb( void *pxTCB )
if ( pvThreadLocalStoragePointersDelCallback[ x ] != NULL ) { //If del cb is set if ( pvThreadLocalStoragePointersDelCallback[ x ] != NULL ) { //If del cb is set
/* In case the TLSP deletion callback has been overwritten by a TLS pointer, gracefully abort. */ /* In case the TLSP deletion callback has been overwritten by a TLS pointer, gracefully abort. */
if ( !esp_ptr_executable( pvThreadLocalStoragePointersDelCallback[ x ] ) ) { if ( !esp_ptr_executable( pvThreadLocalStoragePointersDelCallback[ x ] ) ) {
ESP_LOGE("FreeRTOS", "Fatal error: TLSP deletion callback at index %d overwritten with non-excutable pointer %p", x, pvThreadLocalStoragePointersDelCallback[ x ]); ESP_EARLY_LOGE("FreeRTOS", "Fatal error: TLSP deletion callback at index %d overwritten with non-excutable pointer %p", x, pvThreadLocalStoragePointersDelCallback[ x ]);
abort(); abort();
} }