summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorZefan Li <lizefan@huawei.com>2014-09-18 17:28:46 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-05 13:41:03 -0700
commite8c35a7604d19cd4f9b3ff4015faab8acb7b782c (patch)
treedf7d554aead9d00f55b530fdf8ea04c144a6c9c6 /kernel
parent7d73a89ba1408035381e19a0e890a4aaf15d0ec5 (diff)
cgroup: fix unbalanced locking
commit eb4aec84d6bdf98d00cedb41c18000f7a31e648a upstream. cgroup_pidlist_start() holds cgrp->pidlist_mutex and then calls pidlist_array_load(), and cgroup_pidlist_stop() releases the mutex. It is wrong that we release the mutex in the failure path in pidlist_array_load(), because cgroup_pidlist_stop() will be called no matter if cgroup_pidlist_start() returns errno or not. Fixes: 4bac00d16a8760eae7205e41d2c246477d42a210 Signed-off-by: Zefan Li <lizefan@huawei.com> Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 8fe20392e0c7..0a46b2aa9dfb 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -3833,7 +3833,6 @@ static int pidlist_array_load(struct cgroup *cgrp, enum cgroup_filetype type,
l = cgroup_pidlist_find_create(cgrp, type);
if (!l) {
- mutex_unlock(&cgrp->pidlist_mutex);
pidlist_free(array);
return -ENOMEM;
}