diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-23 12:06:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-23 12:06:18 -0400 |
| commit | 324c7b62d03255f2bdaa4c9653b4c794784bffc0 (patch) | |
| tree | 40f755e8f87c9cca34942b6bfae444a17ac8074b /kernel | |
| parent | f3670394c29ff3730638762c1760fd2f624e6d7b (diff) | |
| parent | eb4aec84d6bdf98d00cedb41c18000f7a31e648a (diff) | |
Merge branch 'for-3.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fix from Tejun Heo:
"One late fix for cgroup.
I was waiting for another set of fixes for a long-standing obscure
cpuset bug but am not sure whether they'll be ready before v3.17
release. This one is a simple fix for a mutex unlock balance bug in
an allocation failure path in pidlist_array_load().
The bug was introduced in v3.14 and the fix is tagged for -stable"
* 'for-3.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: fix unbalanced locking
Diffstat (limited to 'kernel')
| -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, | |||
| 3985 | 3985 | ||
| 3986 | l = cgroup_pidlist_find_create(cgrp, type); | 3986 | l = cgroup_pidlist_find_create(cgrp, type); |
| 3987 | if (!l) { | 3987 | if (!l) { |
| 3988 | mutex_unlock(&cgrp->pidlist_mutex); | ||
| 3989 | pidlist_free(array); | 3988 | pidlist_free(array); |
| 3990 | return -ENOMEM; | 3989 | return -ENOMEM; |
| 3991 | } | 3990 | } |