From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 366683B4EAD for ; Thu, 18 Jun 2026 12:55:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781787312; cv=none; b=uO8tlOhhvoYF1PuBTchohcy3onzQhTbX/WMXiqkHgsFLMy8xfQgh6IasziFArxJRgCnk2e7Rqwqm4fJLEXqrT9uI+648eb+HY1DFy+HEl/7mZuNkM0Ef7D0JOl6kwLbxNY/Ai6WllO9Q7EEhNWljNCgU7agwAhXnObJ5lVZ/41Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781787312; c=relaxed/simple; bh=EmpfrdCO5EgsqLEjX2SnmBVxKoWYKXReHd7T8A+t3do=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RSUSQKBfEkHq6Pu6kZq9c1xED3iWPWhDosjcqyaY6C8rhjqt45tcIUWVWf/0vOfK5AwDA9bQVlNtUnCAhwOoLKqkryP97eFcc8JncRySkkdRJccnJ4qhLb4PYT/HPFxhSOo4xSayggx55VF6EMY+yA5r3yLtrAUebS22l5jWHEI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FT2QI7Ry; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FT2QI7Ry" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14C1B1F000E9; Thu, 18 Jun 2026 12:55:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781787310; bh=RfZKI3D/yhYRk7MBuRA2f2zeCVtHtrZqlF9ARYn1gMI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FT2QI7RyOYljHrDjfm7QtCRZsrM9d81IsyitjCokqLZ/0pghui7Wl9wyrxH1SlDsX 5zRTX2V1uOcXT2LtXhYKKsPwQhTdOv5Gjwv7sCFIhFnuZezCxcWa/vG9yhsoPEtYtQ Mw71Lcpr0s0XeaV311bi8cwsCmb1APkfNv89qPXK2K4Fk6jCvSE0DreraDkPZ2odfX eOt3rMARa5rH+7kGgMEhoHtMpfvOqgHkQNqtvdjt6k6RcF4L6Gr3BMM+yGoucN9CVN rWhM6W0KjTqaCqlY9JBBqBAWgc4B0fta0ghpN/i0tQKtexLXwLH1fa70qtoanyEfpE gUpzzi1e5PNXg== From: Sasha Levin To: stable@vger.kernel.org Cc: Harry Wentland , Alex Hung , Ray Wu , Daniel Wheeler , Alex Deucher , Sasha Levin Subject: [PATCH 5.10.y] drm/amd/display: Use krealloc_array() in dal_vector_reserve() Date: Thu, 18 Jun 2026 08:55:08 -0400 Message-ID: <20260618125508.651313-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026061531-reattach-unlatch-3025@gregkh> References: <2026061531-reattach-unlatch-3025@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Harry Wentland [ Upstream commit da48bc4461b8a5ebfb9264c9b191a701d8e99009 ] [Why & How] dal_vector_reserve() computes the allocation size as "capacity * vector->struct_size" using uint32_t arithmetic, which can silently wrap to a small value on overflow. This would cause krealloc to return a smaller buffer than expected, leading to heap overflows on subsequent vector appends. Replace krealloc() with krealloc_array() which performs an internal overflow check and returns NULL on wrap, preventing the issue. Fixes: 2004f45ef83f ("drm/amd/display: Use kernel alloc/free") Assisted-by: Copilot:claude-opus-4.6 Reviewed-by: Alex Hung Signed-off-by: Harry Wentland Signed-off-by: Ray Wu Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher (cherry picked from commit 37668568641ccc4cc1dbca4923d0a16609dd5707) Cc: stable@vger.kernel.org [ changed `krealloc_array(p, capacity, struct_size)` to `krealloc(p, array_size(capacity, struct_size))` since krealloc_array() is absent in 5.10 ] Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/basics/vector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/basics/vector.c b/drivers/gpu/drm/amd/display/dc/basics/vector.c index 8f93d25f91ee2b..68c34a4e253ac1 100644 --- a/drivers/gpu/drm/amd/display/dc/basics/vector.c +++ b/drivers/gpu/drm/amd/display/dc/basics/vector.c @@ -292,7 +292,7 @@ bool dal_vector_reserve(struct vector *vector, uint32_t capacity) return true; new_container = krealloc(vector->container, - capacity * vector->struct_size, GFP_KERNEL); + array_size(capacity, vector->struct_size), GFP_KERNEL); if (new_container) { vector->container = new_container; -- 2.53.0