From: Daeseok Youn Date: Wed, 16 Apr 2014 05:32:29 +0000 (+0900) Subject: workqueue: fix bugs in wq_update_unbound_numa() failure path X-Git-Tag: v3.10.51~448 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=55a3dfcc84ab3dc82708d93cd0bca4a0aad7715c;p=platform%2Fkernel%2Flinux-3.10.git workqueue: fix bugs in wq_update_unbound_numa() failure path commit 77f300b198f93328c26191b52655ce1b62e202cf upstream. wq_update_unbound_numa() failure path has the following two bugs. - alloc_unbound_pwq() is called without holding wq->mutex; however, if the allocation fails, it jumps to out_unlock which tries to unlock wq->mutex. - The function should switch to dfl_pwq on failure but didn't do so after alloc_unbound_pwq() failure. Fix it by regrabbing wq->mutex and jumping to use_dfl_pwq on alloc_unbound_pwq() failure. Signed-off-by: Daeseok Youn Acked-by: Lai Jiangshan Signed-off-by: Tejun Heo Fixes: 4c16bd327c74 ("workqueue: implement NUMA affinity for unbound workqueues") Signed-off-by: Greg Kroah-Hartman --- diff --git a/kernel/workqueue.c b/kernel/workqueue.c index db7a6ac..45c24d7 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -4043,7 +4043,8 @@ static void wq_update_unbound_numa(struct workqueue_struct *wq, int cpu, if (!pwq) { pr_warning("workqueue: allocation failed while updating NUMA affinity of \"%s\"\n", wq->name); - goto out_unlock; + mutex_lock(&wq->mutex); + goto use_dfl_pwq; } /*