Commit 8e28921e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull cgroup fix from Tejun Heo:
 "Fix for a minor memory leak bug in the cgroup init failure path"

* 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: fix a leak when percpu_ref_init() fails
parents 4264bc13 da0a12ca

kernel/cgroup.c

+3 −1
Original line number Diff line number Diff line
@@ -4335,8 +4335,10 @@ static long cgroup_create(struct cgroup *parent, struct dentry *dentry, 
		}



		err = percpu_ref_init(&css->refcnt, css_release);

		if (err)

		if (err) {

			ss->css_free(cgrp);

			goto err_free_all;

		}



		init_cgroup_css(css, ss, cgrp);