[Concurrency] Clear current task TSD before enqueuing task in swift_task_switch. (swiftlang#74736)

mikeash · web-flow · commit 75fa43ebd86b · 2024-07-24T12:29:01.000+09:00
The executor may execute and free the task while the enqueue code is still finishing up. If that code tries to get an async backtrace (for example, if it calls malloc/free with malloc stack logging enabled) then it will find a dangling pointer in the current task TSD, and dereferencing it may crash.

rdar://130125017
diff --git a/stdlib/public/Concurrency/Actor.cpp b/stdlib/public/Concurrency/Actor.cpp
@@ -2199,8 +2199,8 @@ static void swift_task_switchImpl(SWIFT_ASYNC_CONTEXT AsyncContext *resumeContex
       "switch failed, task %p enqueued on executor %p (task executor: %p)",
       task, newExecutor.getIdentity(), currentTaskExecutor.getIdentity());
 
-  task->flagAsAndEnqueueOnExecutor(newExecutor);
   _swift_task_clearCurrent();
+  task->flagAsAndEnqueueOnExecutor(newExecutor);
 }
 
 /*****************************************************************************/

Original file line number	Diff line number	Diff line change
`@@ -2199,8 +2199,8 @@ static void swift_task_switchImpl(SWIFT_ASYNC_CONTEXT AsyncContext *resumeContex`
`2199`	`2199`	`"switch failed, task %p enqueued on executor %p (task executor: %p)",`
`2200`	`2200`	`task, newExecutor.getIdentity(), currentTaskExecutor.getIdentity());`
`2201`	`2201`
`2202`		`- task->flagAsAndEnqueueOnExecutor(newExecutor);`
`2203`	`2202`	`_swift_task_clearCurrent();`
	`2203`	`+ task->flagAsAndEnqueueOnExecutor(newExecutor);`
`2204`	`2204`	`}`
`2205`	`2205`
`2206`	`2206`	`/*****************************************************************************/`