Commit 981e6519 authored Oct 29, 2024 by Srinivasan Shanmugam Committed by Liu Chuang Oct 29, 2024

drm/amd/display: Fix index out of bounds in degamma hardware format translation

stable inclusion
from stable-v5.10.227
commit c130a3c09e3746c1a09ce26c20d21d449d039b1d
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAYR9A
CVE: CVE-2024-49894

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c130a3c09e3746c1a09ce26c20d21d449d039b1d



--------------------------------

[ Upstream commit b7e99058eb2e86aabd7a10761e76cae33d22b49f ]

Fixes index out of bounds issue in
`cm_helper_translate_curve_to_degamma_hw_format` function. 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.

Reported by smatch:
drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_cm_common.c:594 cm_helper_translate_curve_to_degamma_hw_format() error: buffer overflow 'output_tf->tf_pts.red' 1025 <= s32max
drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_cm_common.c:595 cm_helper_translate_curve_to_degamma_hw_format() error: buffer overflow 'output_tf->tf_pts.green' 1025 <= s32max
drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_cm_common.c:596 cm_helper_translate_curve_to_degamma_hw_format() error: buffer overflow 'output_tf->tf_pts.blue' 1025 <= s32max

Cc: Tom Chung <chiahsuan.chung@amd.com>
Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Cc: Roman Li <roman.li@amd.com>
Cc: Alex Hung <alex.hung@amd.com>
Cc: Aurabindo Pillai <aurabindo.pillai@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Hamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Reviewed-by: Tom Chung <chiahsuan.chung@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Liu Chuang <liuchuang40@huawei.com>

parent 635900c4

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -560,6 +560,8 @@ bool cm_helper_translate_curve_to_degamma_hw_format(
		i += increment) {
		if (j == hw_points - 1)
		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];