diff options
| author | Zefan Li <lizefan@huawei.com> | 2014-09-18 11:28:46 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-09-18 18:32:52 +0200 |
| commit | eb4aec84d6bdf98d00cedb41c18000f7a31e648a (patch) | |
| tree | fa9d81be8ec27c49e3424fc4b2e30f41c2add9a5 /kernel/cgroup.c | |
| parent | cgroup: check cgroup liveliness before unbreaking kernfs (diff) | |
| download | linux-eb4aec84d6bdf98d00cedb41c18000f7a31e648a.tar.xz linux-eb4aec84d6bdf98d00cedb41c18000f7a31e648a.zip | |
cgroup: fix unbalanced locking
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
Cc: <stable@vger.kernel.org> # 3.14+
Signed-off-by: Zefan Li <lizefan@huawei.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
Diffstat (limited to 'kernel/cgroup.c')
| -rw-r--r-- | kernel/cgroup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 940aced4ed00..3a73f995a81e 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -3985,7 +3985,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; } |