diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-19 16:13:40 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-19 16:13:40 -0700 |
commit | 7c3895383fea48dab2374b04a936de4717a85a81 (patch) | |
tree | a56b03fee8d9b5387ba612b60a7380fddb14c726 | |
parent | ea1cd65a648bd98ff9d028a647462d28313aadfd (diff) | |
parent | 3eb59ec64fc7a3f4576da23f811b39331b830ba2 (diff) | |
download | linux-7c3895383fea48dab2374b04a936de4717a85a81.tar.gz linux-7c3895383fea48dab2374b04a936de4717a85a81.tar.bz2 linux-7c3895383fea48dab2374b04a936de4717a85a81.zip |
Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fix from Tejun Heo:
"One really late cgroup patch to fix error path in create_css().
Hitting this bug would be pretty rare but still possible and it gets
delayed we'd need to backport it through -stable anyway. It only
updates error path in create_css() and has low chance of new
breakages"
* 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: fix a failure path in create_css()
-rw-r--r-- | kernel/cgroup.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 105f273b6f86..0c753ddd223b 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -4112,17 +4112,17 @@ static int create_css(struct cgroup *cgrp, struct cgroup_subsys *ss) err = percpu_ref_init(&css->refcnt, css_release); if (err) - goto err_free; + goto err_free_css; init_css(css, ss, cgrp); err = cgroup_populate_dir(cgrp, 1 << ss->subsys_id); if (err) - goto err_free; + goto err_free_percpu_ref; err = online_css(css); if (err) - goto err_free; + goto err_clear_dir; dget(cgrp->dentry); css_get(css->parent); @@ -4138,8 +4138,11 @@ static int create_css(struct cgroup *cgrp, struct cgroup_subsys *ss) return 0; -err_free: +err_clear_dir: + cgroup_clear_dir(css->cgroup, 1 << css->ss->subsys_id); +err_free_percpu_ref: percpu_ref_cancel_init(&css->refcnt); +err_free_css: ss->css_free(css); return err; } |