Skip to contentSkip to conversation

workqueue: Put the pwq after detaching the rescuer from the pool

PATCH Applied Lai Jiangshan 2 participants 2 messages Jan 23, 2025 – Jan 24, 2025 Workqueue

lore
Share & tools
lore

Lai Jiangshan

author reviewer
#0 lore raw

PATCH 1/1 workqueue: Put the pwq after detaching the rescuer from the pool

From: Lai Jiangshan <[email protected]>

The commit 68f83057b913("workqueue: Reap workers via kthread_stop() and remove detach_completion") adds code to reap the normal workers but mistakenly does not handle the rescuer and also removes the code waiting for the rescuer in put_unbound_pool(), which caused a use-after-free bug reported by Cheung Wall.

To avoid the use-after-free bug, the pool’s reference must be held until the detachment is complete. Therefore, move the code that puts the pwq after detaching the rescuer from the pool.

Cc cheung wall <[email protected]>
Fixes 68f83057b913("workqueue: Reap workers via kthread_stop() and remove detach_completion")
---
 kernel/workqueue.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
kernel/workqueue.c +6 -6
index 33a23c7b2274..ccad33001c58 100644
@@ -3516,12 +3516,6 @@ static int rescuer_thread(void *__rescuer)
 			}
 		}
 
-		/*
-		 * Put the reference grabbed by send_mayday().  @pool won't
-		 * go away while we're still attached to it.
-		 */
-		put_pwq(pwq);
-
 		/*
 		 * Leave this pool. Notify regular workers; otherwise, we end up
 		 * with 0 concurrency and stalling the execution.
@@ -3532,6 +3526,12 @@ static int rescuer_thread(void *__rescuer)
 
 		worker_detach_from_pool(rescuer);
 
+		/*
+		 * Put the reference grabbed by send_mayday().  @pool might
+		 * go away any time after it.
+		 */
+		put_pwq_unlocked(pwq);
+
 		raw_spin_lock_irq(&wq_mayday_lock);
 	}
 
Signature · 1 line
2.19.1.6.gb485710b
maintainer Applied
#1 lore raw
Quoted 12 lines · Lai Jiangshan

From: Lai Jiangshan <[email protected]>

The commit 68f83057b913("workqueue: Reap workers via kthread_stop() and remove detach_completion") adds code to reap the normal workers but mistakenly does not handle the rescuer and also removes the code waiting for the rescuer in put_unbound_pool(), which caused a use-after-free bug reported by Cheung Wall.

To avoid the use-after-free bug, the pool’s reference must be held until the detachment is complete. Therefore, move the code that puts the pwq after detaching the rescuer from the pool.

Quoted 5 lines
Cc cheung wall <[email protected]>
Fixes 68f83057b913("workqueue: Reap workers via kthread_stop() and remove detach_completion")

Applied to wq/for-6.14-fixes.

Thanks.

Signature · 1 line
tejun