kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cgroup: fix error return value in cgroup_mount()

Browse source 
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
This commit is contained in:
Tejun Heo 2014-02-08 10:26:33 -05:00
parent ab3f5faa62
commit eb46bf8969
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kernel/cgroup.c
View file

@ -1566,10 +1566,10 @@ static struct dentry *cgroup_mount(struct file_system_type *fs_type,
mutex_lock(&cgroup_mutex); mutex_lock(&cgroup_mutex);
mutex_lock(&cgroup_root_mutex); mutex_lock(&cgroup_root_mutex);
root_cgrp->id = idr_alloc(&root->cgroup_idr, root_cgrp, ret = idr_alloc(&root->cgroup_idr, root_cgrp, 0, 1, GFP_KERNEL);
0, 1, GFP_KERNEL); if (ret < 0)
if (root_cgrp->id < 0)
goto unlock_drop; goto unlock_drop;
root_cgrp->id = ret;
/* Check for name clashes with existing mounts */ /* Check for name clashes with existing mounts */
ret = -EBUSY; ret = -EBUSY;