Commit 63bd5444 authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher

drm/amd/display: Fix potential access beyond end of array in CM

Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
CC: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f110892e
...@@ -367,15 +367,15 @@ bool cm_helper_translate_curve_to_hw_format( ...@@ -367,15 +367,15 @@ bool cm_helper_translate_curve_to_hw_format(
lut_params->hw_points_num = hw_points; lut_params->hw_points_num = hw_points;
i = 1; k = 0;
for (k = 0; k < MAX_REGIONS_NUMBER && i < MAX_REGIONS_NUMBER; k++) { for (i = 1; i < MAX_REGIONS_NUMBER; i++) {
if (seg_distr[k] != -1) { if (seg_distr[k] != -1) {
lut_params->arr_curve_points[k].segments_num = lut_params->arr_curve_points[k].segments_num =
seg_distr[k]; seg_distr[k];
lut_params->arr_curve_points[i].offset = lut_params->arr_curve_points[i].offset =
lut_params->arr_curve_points[k].offset + (1 << seg_distr[k]); lut_params->arr_curve_points[k].offset + (1 << seg_distr[k]);
} }
i++; k++;
} }
if (seg_distr[k] != -1) if (seg_distr[k] != -1)
...@@ -529,15 +529,15 @@ bool cm_helper_translate_curve_to_degamma_hw_format( ...@@ -529,15 +529,15 @@ bool cm_helper_translate_curve_to_degamma_hw_format(
lut_params->hw_points_num = hw_points; lut_params->hw_points_num = hw_points;
i = 1; k = 0;
for (k = 0; k < MAX_REGIONS_NUMBER && i < MAX_REGIONS_NUMBER; k++) { for (i = 1; i < MAX_REGIONS_NUMBER; i++) {
if (seg_distr[k] != -1) { if (seg_distr[k] != -1) {
lut_params->arr_curve_points[k].segments_num = lut_params->arr_curve_points[k].segments_num =
seg_distr[k]; seg_distr[k];
lut_params->arr_curve_points[i].offset = lut_params->arr_curve_points[i].offset =
lut_params->arr_curve_points[k].offset + (1 << seg_distr[k]); lut_params->arr_curve_points[k].offset + (1 << seg_distr[k]);
} }
i++; k++;
} }
if (seg_distr[k] != -1) if (seg_distr[k] != -1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment