Fix potential race condition in z_task_cancel

bjsowa · bjsowa · commit 44649a2d800e · 2024-12-09T10:55:40.000+01:00
diff --git a/src/system/freertos_plus_tcp/system.c b/src/system/freertos_plus_tcp/system.c
@@ -128,10 +128,14 @@ z_result_t _z_task_detach(_z_task_t *task) {
 
 z_result_t _z_task_cancel(_z_task_t *task) {
     xEventGroupSetBits(task->join_event, 1);
+
+    taskENTER_CRITICAL();
     if (task->handle != NULL) {
         vTaskDelete(task->handle);
         task->handle = NULL;
     }
+    taskEXIT_CRITICAL();
+
     return _Z_RES_OK;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -128,10 +128,14 @@ z_result_t _z_task_detach(_z_task_t *task) {`
`128`	`128`
`129`	`129`	`z_result_t _z_task_cancel(_z_task_t *task) {`
`130`	`130`	`xEventGroupSetBits(task->join_event, 1);`
	`131`	`+`
	`132`	`+ taskENTER_CRITICAL();`
`131`	`133`	`if (task->handle != NULL) {`
`132`	`134`	`vTaskDelete(task->handle);`
`133`	`135`	`task->handle = NULL;`
`134`	`136`	`}`
	`137`	`+ taskEXIT_CRITICAL();`
	`138`	`+`
`135`	`139`	`return _Z_RES_OK;`
`136`	`140`	`}`
`137`	`141`