linux-kernel - [PATCH V2] workqueue: fix double unlock bug

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <3760742.KPOjd8C4i8@daeseok-laptop.cloud.net>
Date:	Mon, 14 Apr 2014 19:41:41 +0900
From:	Daeseok Youn <daeseok.youn@...il.com>
To:	tj@...nel.org, laijs@...fujitsu.com
Cc:	linux-kernel@...r.kernel.org
Subject: [PATCH V2] workqueue: fix double unlock bug


mutex_unlock() and put_pwq_unlocked() do not need to be called
when alloc_unbound_pwq() is failed.

And remove "if" condition for whether "pwq" is same as "wq->dfl_pwq"
when wq_calc_node_cpumask() returns false and just use "goto use_dfl_pwq"

Signed-off-by: Daeseok Youn <daeseok.youn@...il.com>
---
V2: replace "if condition" with "goto" as Lai's comment.

 kernel/workqueue.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 0ee63af..9853067 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4087,10 +4087,7 @@ static void wq_update_unbound_numa(struct workqueue_struct *wq, int cpu,
 		if (cpumask_equal(cpumask, pwq->pool->attrs->cpumask))
 			goto out_unlock;
 	} else {
-		if (pwq == wq->dfl_pwq)
-			goto out_unlock;
-		else
-			goto use_dfl_pwq;
+		goto use_dfl_pwq;
 	}
 
 	mutex_unlock(&wq->mutex);
@@ -4100,7 +4097,7 @@ 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;
+		return;
 	}
 
 	/*
-- 
1.7.4.4


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/