diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 22:33:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 22:33:10 -0700 |
| commit | 1338631433d8de7cf85b7e8fcf1a389ad89e7a8f (patch) | |
| tree | 9877297064899da2ef7f6f50d16d05a1cf2f1719 | |
| parent | 4bde23f8751f388867766b0a62ed1ef8b7e01561 (diff) | |
| parent | 8f121918f2e49f852de1acdc5255cc1ef440d85b (diff) | |
Merge branch 'for-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull urgent cgroup fix from Tejun Heo:
"Commit 61d1d219c4c0 ('cgroup: remove extra calls to
find_existing_css_set') which was part of the rc1 cgroup pull request
made writes to the cgroup "tasks" file return an uninitialized retval
on success which can cause boot failures with systemd.
The change stayed in linux-next for quite some time but gcc
interestingly failed to emit warning about using uninitialized
variable and the problem seems to materialize only for certain build
combinations (probably depends on register allocation).
It's just missing local variable initialization and the fix is trivial
& safe. As the problem is critical when it materializes, I'm
fast-tracking it. Also included is Li's email address change in
MAINTAINERS."
* 'for-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: cgroup_attach_task() could return -errno after success
cgroup: update MAINTAINERS entry
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | kernel/cgroup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 64168f6dd89..eecf3441ac2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1940,7 +1940,7 @@ F: drivers/connector/ CONTROL GROUPS (CGROUPS) M: Tejun Heo <tj@kernel.org> -M: Li Zefan <lizf@cn.fujitsu.com> +M: Li Zefan <lizefan@huawei.com> L: containers@lists.linux-foundation.org L: cgroups@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git diff --git a/kernel/cgroup.c b/kernel/cgroup.c index f4ea4b6f3cf..ed64ccac67c 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -1883,7 +1883,7 @@ static void cgroup_task_migrate(struct cgroup *cgrp, struct cgroup *oldcgrp, */ int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk) { - int retval; + int retval = 0; struct cgroup_subsys *ss, *failed_ss = NULL; struct cgroup *oldcgrp; struct cgroupfs_root *root = cgrp->root; |