From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6054B1EF946; Wed, 6 Nov 2024 12:39:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730896748; cv=none; b=nU3dm7AMTNwJEbpTt2rRpbvI0aagNhTFH6XXcmRhXadTAZiYjabM205DiBQ0Vmua/v/yyWNjvYpI6Qt2XBw0dNJR7h9osFvyuZbmmpWZiA/FAuKuABrwvbaric959Yi1SyKbo0JtqQX8h2+1dibLwhjt7ZZUw0zmVoODgnXQcOc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730896748; c=relaxed/simple; bh=PK8NUcBlMJZIoGD9beO1oOonfk3cHqv70pj5fc+HNw8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=omHHAYANFU0SYBr9n0fELqyRanYP1Bg+X1hr+jAudeQtn512hltWg71G0zBc+2PNgXvBOuU7BosZ7hy7DwMFmP1up9/9XsT6SalqEqMhXGP66Q29PKvZpTzQK7l412fEYCJ7/4zOksgq2ayTKn3OUCTWQG/GlgsYBqTiPaKM2kw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Jiqy9gwj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Jiqy9gwj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8E00C4CED6; Wed, 6 Nov 2024 12:39:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730896748; bh=PK8NUcBlMJZIoGD9beO1oOonfk3cHqv70pj5fc+HNw8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jiqy9gwjM3igMCp862/dzxw6f/wQw1S+SCmNClPgIfvEy0jzk6k7G4vzIRbvRV695 oZkXfLkqgdGX5eYX9DJGi9EzsEt61ZGML+gzqxdNlWTo6yUqWMaxfJQ9x3dSjDsvRj FSg0IB5yvDLETXDc6jokOLYRiF3b8cgHfrkKlM+s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Xiu Jianfeng , =?UTF-8?q?Michal=20Koutn=C3=BD?= , Tejun Heo , Sasha Levin Subject: [PATCH 5.10 058/110] cgroup: Fix potential overflow issue when checking max_depth Date: Wed, 6 Nov 2024 13:04:24 +0100 Message-ID: <20241106120304.802478761@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106120303.135636370@linuxfoundation.org> References: <20241106120303.135636370@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xiu Jianfeng [ 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 Reviewed-by: Michal Koutný Signed-off-by: Tejun Heo Signed-off-by: Sasha Levin --- kernel/cgroup/cgroup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 66970b74106c8..e0fd62d56110a 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -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++; -- 2.43.0