Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c389538 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents ea1cd65a 3eb59ec6

kernel/cgroup.c

+7 −4
Original line number Diff line number Diff line
@@ -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;

}