diff options
| author | Johannes Weiner <hannes@cmpxchg.org> | 2016-06-17 18:23:59 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-06-17 20:16:28 +0200 |
| commit | 8c8a5502183c724854afd2f143a72f7eb71b6fea (patch) | |
| tree | 8d9c0a06d651b1b6429d8a4968570c0b0013115f /kernel/cgroup.c | |
| parent | Merge branch 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | linux-8c8a5502183c724854afd2f143a72f7eb71b6fea.tar.xz linux-8c8a5502183c724854afd2f143a72f7eb71b6fea.zip | |
cgroup: fix idr leak for the first cgroup root
The valid cgroup hierarchy ID range includes 0, so we can't filter for
positive numbers when freeing it, or it'll leak the first ID. No big
deal, just disruptive when reading the code.
The ID is freed during error handling and when the reference count
hits zero, so the double-free test is not necessary; remove it.
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/cgroup.c')
| -rw-r--r-- | kernel/cgroup.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 86cb5c6e8932..36fc0ff506c3 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -1158,18 +1158,12 @@ static void cgroup_exit_root_id(struct cgroup_root *root) { lockdep_assert_held(&cgroup_mutex); - if (root->hierarchy_id) { - idr_remove(&cgroup_hierarchy_idr, root->hierarchy_id); - root->hierarchy_id = 0; - } + idr_remove(&cgroup_hierarchy_idr, root->hierarchy_id); } static void cgroup_free_root(struct cgroup_root *root) { if (root) { - /* hierarchy ID should already have been released */ - WARN_ON_ONCE(root->hierarchy_id); - idr_destroy(&root->cgroup_idr); kfree(root); } |