diff options
| author | Tejun Heo <tj@kernel.org> | 2014-02-08 10:26:33 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-08 10:26:33 -0500 |
| commit | eb46bf89696972b856a9adb6aebd5c7b65c266e4 (patch) | |
| tree | c4dd21535dd50996f296d056d05068fbe534dffa /kernel | |
| parent | ab3f5faa6255a0eb4f832675507d9e295ca7e9ba (diff) | |
| download | linux-stable-eb46bf89696972b856a9adb6aebd5c7b65c266e4.tar.gz linux-stable-eb46bf89696972b856a9adb6aebd5c7b65c266e4.tar.bz2 linux-stable-eb46bf89696972b856a9adb6aebd5c7b65c266e4.zip | |
cgroup: fix error return value in cgroup_mount()
When cgroup_mount() fails to allocate an id for the root, it didn't
set ret before jumping to unlock_drop ending up returning 0 after a
failure. Fix it.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizefan@huawei.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cgroup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index aa95591c1430..793f37176077 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -1566,10 +1566,10 @@ static struct dentry *cgroup_mount(struct file_system_type *fs_type, mutex_lock(&cgroup_mutex); mutex_lock(&cgroup_root_mutex); - root_cgrp->id = idr_alloc(&root->cgroup_idr, root_cgrp, - 0, 1, GFP_KERNEL); - if (root_cgrp->id < 0) + ret = idr_alloc(&root->cgroup_idr, root_cgrp, 0, 1, GFP_KERNEL); + if (ret < 0) goto unlock_drop; + root_cgrp->id = ret; /* Check for name clashes with existing mounts */ ret = -EBUSY; |