Skip to contentSkip to conversation

workqueue: free rescuer on destroy_workqueue

PATCH Applied Xiaotian Feng 2 participants 2 messages Aug 13, 2010 – Aug 16, 2010 Workqueue

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 workqueue: free rescuer on destroy_workqueue

wq->rescuer is not freed when wq is destroyed, leads a memory leak then. This patch also remove a redundant line.

Cc Tejun Heo <[email protected]>
Cc Oleg Nesterov <[email protected]>
---
 kernel/workqueue.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/workqueue.c +1 -1
index 2994a0e..1001b6e 100644
@@ -2782,7 +2782,6 @@ struct workqueue_struct *__alloc_workqueue_key(const char *name,
 		if (IS_ERR(rescuer->task))
 			goto err;
 
-		wq->rescuer = rescuer;
 		rescuer->task->flags |= PF_THREAD_BOUND;
 		wake_up_process(rescuer->task);
 	}
@@ -2848,6 +2847,7 @@ void destroy_workqueue(struct workqueue_struct *wq)
 	if (wq->flags & WQ_RESCUER) {
 		kthread_stop(wq->rescuer->task);
 		free_mayday_mask(wq->mayday_mask);
+		kfree(wq->rescuer);
 	}
 
 	free_cwqs(wq);
Signature · 1 line
1.7.2.1