Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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()
+7
-4
+7
-4
kernel/cgroup.c
+7
-4
kernel/cgroup.c
···
4112
4112
4113
4113
err = percpu_ref_init(&css->refcnt, css_release);
4114
4114
if (err)
4115
-
goto err_free;
4115
+
goto err_free_css;
4116
4116
4117
4117
init_css(css, ss, cgrp);
4118
4118
4119
4119
err = cgroup_populate_dir(cgrp, 1 << ss->subsys_id);
4120
4120
if (err)
4121
-
goto err_free;
4121
+
goto err_free_percpu_ref;
4122
4122
4123
4123
err = online_css(css);
4124
4124
if (err)
4125
-
goto err_free;
4125
+
goto err_clear_dir;
4126
4126
4127
4127
dget(cgrp->dentry);
4128
4128
css_get(css->parent);
···
4138
4138
4139
4139
return 0;
4140
4140
4141
-
err_free:
4141
+
err_clear_dir:
4142
+
cgroup_clear_dir(css->cgroup, 1 << css->ss->subsys_id);
4143
+
err_free_percpu_ref:
4142
4144
percpu_ref_cancel_init(&css->refcnt);
4145
+
err_free_css:
4143
4146
ss->css_free(css);
4144
4147
return err;
4145
4148
}