evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

Browse source 
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()
This commit is contained in:
Linus Torvalds 2014-03-19 16:13:40 -07:00
commit 7c3895383f
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
kernel/cgroup.c
View file

@ -4112,17 +4112,17 @@ static int create_css(struct cgroup *cgrp, struct cgroup_subsys *ss)
err = percpu_ref_init(&css->refcnt, css_release); err = percpu_ref_init(&css->refcnt, css_release);
if (err) if (err)
goto err_free; goto err_free_css;
init_css(css, ss, cgrp); init_css(css, ss, cgrp);
err = cgroup_populate_dir(cgrp, 1 << ss->subsys_id); err = cgroup_populate_dir(cgrp, 1 << ss->subsys_id);
if (err) if (err)
goto err_free; goto err_free_percpu_ref;
err = online_css(css); err = online_css(css);
if (err) if (err)
goto err_free; goto err_clear_dir;
dget(cgrp->dentry); dget(cgrp->dentry);
css_get(css->parent); css_get(css->parent);
@ -4138,8 +4138,11 @@ static int create_css(struct cgroup *cgrp, struct cgroup_subsys *ss)
return 0; 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); percpu_ref_cancel_init(&css->refcnt);
err_free_css:
ss->css_free(css); ss->css_free(css);
return err; return err;
} }