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 9776A196450; Wed, 25 Sep 2024 11:49:44 +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=1727264984; cv=none; b=rTK454D7KPLnxwKHn+CG4AZr+KBJyBYf4BzsEKG1HSBGOpmbyU3y6YMmMx6SW5xNX8xgNNMhRug0RxiDClK6byoh8fa8m7Fg4R8rUar7YpCFLsGT7d1ebAltJvkP7fSiacTEVTx3TTPKyD875GPuP7+/aBm7noMJfmkeUlsG62o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727264984; c=relaxed/simple; bh=bxM/3bIOkkjTIets2DwQJY2+fk7h8rmncMBHNXUXJfo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bP/XiW+UBiv0osCpCwAOrCFVumTmicAYWZ66ZJhpXNF6kgOX4K7NVeJSsIZLV0YCfcfpsw8Eb/tgme9NwCGclzL7SRsitKnMg0ZXm/Y8yFFK2MW1197REIjfHr2Ihsq4ULwqxes2FfqbxSQ/Ti3yZFqCDNmEX4gaonnClY+Py0U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tIE1WMa5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tIE1WMa5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C81A0C4CEC3; Wed, 25 Sep 2024 11:49:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727264984; bh=bxM/3bIOkkjTIets2DwQJY2+fk7h8rmncMBHNXUXJfo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tIE1WMa5BuxQTLF4Pwhl4YG75wHsG+g+/0ioPJ0WZz2XcCERfwgE3dninxDJLE28b xNfBe9t8pKRKxS/Mc3i0UYvV3MTJFeqnTH360OyDVIE5zAGEa16skEOGjff9lEaj4m DcxzclXYk4i6Iw6A6epFTIKrwsV2H8IxhUTgjbPpFpxBLQTWFzeZlhkAcJryAhNPpC cZHAk6gElNiOhBTJu19JoDHpBGnrSjZzKM5q25Hqhxj32sGVq8d/sO8ckjzeZ6ZyWD 5X6zsPGmbkogalR6v1EIlvGX5ZpRGwCCRrOoK3heY9fO4rBgw38xfJtLUBMnTw/4qb LcsUAGLPOxnsA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Srinivasan Shanmugam , Tom Chung , Rodrigo Siqueira , Roman Li , Alex Hung , Aurabindo Pillai , Harry Wentland , Hamza Mahfooz , Alex Deucher , Sasha Levin , sunpeng.li@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, harikrishna.revalla@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.11 189/244] drm/amd/display: Fix index out of bounds in DCN30 color transformation Date: Wed, 25 Sep 2024 07:26:50 -0400 Message-ID: <20240925113641.1297102-189-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240925113641.1297102-1-sashal@kernel.org> References: <20240925113641.1297102-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.11 Content-Transfer-Encoding: 8bit From: Srinivasan Shanmugam [ Upstream commit d81873f9e715b72d4f8d391c8eb243946f784dfc ] This commit addresses a potential index out of bounds issue in the `cm3_helper_translate_curve_to_hw_format` function in the DCN30 color management module. The issue could occur when the index 'i' exceeds the number of transfer function points (TRANSFER_FUNC_POINTS). The fix adds a check to ensure 'i' is within bounds before accessing the transfer function points. If 'i' is out of bounds, the function returns false to indicate an error. drivers/gpu/drm/amd/amdgpu/../display/dc/dcn30/dcn30_cm_common.c:180 cm3_helper_translate_curve_to_hw_format() error: buffer overflow 'output_tf->tf_pts.red' 1025 <= s32max drivers/gpu/drm/amd/amdgpu/../display/dc/dcn30/dcn30_cm_common.c:181 cm3_helper_translate_curve_to_hw_format() error: buffer overflow 'output_tf->tf_pts.green' 1025 <= s32max drivers/gpu/drm/amd/amdgpu/../display/dc/dcn30/dcn30_cm_common.c:182 cm3_helper_translate_curve_to_hw_format() error: buffer overflow 'output_tf->tf_pts.blue' 1025 <= s32max Cc: Tom Chung Cc: Rodrigo Siqueira Cc: Roman Li Cc: Alex Hung Cc: Aurabindo Pillai Cc: Harry Wentland Cc: Hamza Mahfooz Signed-off-by: Srinivasan Shanmugam Reviewed-by: Tom Chung Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c index edc77615d0973..0433f6b5dac78 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c +++ b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c @@ -177,6 +177,8 @@ bool cm3_helper_translate_curve_to_hw_format( i += increment) { if (j == hw_points) break; + if (i >= TRANSFER_FUNC_POINTS) + return false; rgb_resulted[j].red = output_tf->tf_pts.red[i]; rgb_resulted[j].green = output_tf->tf_pts.green[i]; rgb_resulted[j].blue = output_tf->tf_pts.blue[i]; -- 2.43.0