]> git.hungrycats.org Git - linux/commitdiff
cgroup: Fix potential overflow issue when checking max_depth
authorXiu Jianfeng <xiujianfeng@huawei.com>
Sat, 12 Oct 2024 07:22:46 +0000 (07:22 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Nov 2024 15:22:00 +0000 (16:22 +0100)
[ Upstream commit 3cc4e13bb1617f6a13e5e6882465984148743cf4 ]

cgroup.max.depth is the maximum allowed descent depth below the current
cgroup. If the actual descent depth is equal or larger, an attempt to
create a new child cgroup will fail. However due to the cgroup->max_depth
is of int type and having the default value INT_MAX, the condition
'level > cgroup->max_depth' will never be satisfied, and it will cause
an overflow of the level after it reaches to INT_MAX.

Fix it by starting the level from 0 and using '>=' instead.

It's worth mentioning that this issue is unlikely to occur in reality,
as it's impossible to have a depth of INT_MAX hierarchy, but should be
be avoided logically.

Fixes: 1a926e0bbab8 ("cgroup: implement hierarchy limits")
Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
Reviewed-by: Michal Koutný <mkoutny@suse.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/cgroup/cgroup.c

index 66970b74106c8cc81ecfbfe559de4837e76f33a2..e0fd62d56110a5c7342ba3475edf5bb7f2bc5914 100644 (file)
@@ -5437,7 +5437,7 @@ static bool cgroup_check_hierarchy_limits(struct cgroup *parent)
 {
        struct cgroup *cgroup;
        int ret = false;
-       int level = 1;
+       int level = 0;
 
        lockdep_assert_held(&cgroup_mutex);
 
@@ -5445,7 +5445,7 @@ static bool cgroup_check_hierarchy_limits(struct cgroup *parent)
                if (cgroup->nr_descendants >= cgroup->max_descendants)
                        goto fail;
 
-               if (level > cgroup->max_depth)
+               if (level >= cgroup->max_depth)
                        goto fail;
 
                level++;