Commit 6f3472a9 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Alex Deucher

drm/amd/display/dc/dce: Fix multiple potential integer overflows

Add suffix ULL to constant 5 and cast variables target_pix_clk_khz and
feedback_divider to uint64_t in order to avoid multiple potential integer
overflows and give the compiler complete information about the proper
arithmetic to use.

Notice that such constant and variables are used in contexts that
expect expressions of type uint64_t (64 bits, unsigned). The current
casts to uint64_t effectively apply to each expression as a whole,
but they do not prevent them from being evaluated using 32-bit
arithmetic instead of 64-bit arithmetic.

Also, once the expressions are properly evaluated using 64-bit
arithmentic, there is no need for the parentheses that enclose
them.

Addresses-Coverity-ID: 1460245 ("Unintentional integer overflow")
Addresses-Coverity-ID: 1460286 ("Unintentional integer overflow")
Addresses-Coverity-ID: 1460401 ("Unintentional integer overflow")
Fixes: 4562236b ("drm/amd/dc: Add dc display driver (v2)")
Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4c1ac53e
...@@ -133,7 +133,7 @@ static bool calculate_fb_and_fractional_fb_divider( ...@@ -133,7 +133,7 @@ static bool calculate_fb_and_fractional_fb_divider(
uint64_t feedback_divider; uint64_t feedback_divider;
feedback_divider = feedback_divider =
(uint64_t)(target_pix_clk_khz * ref_divider * post_divider); (uint64_t)target_pix_clk_khz * ref_divider * post_divider;
feedback_divider *= 10; feedback_divider *= 10;
/* additional factor, since we divide by 10 afterwards */ /* additional factor, since we divide by 10 afterwards */
feedback_divider *= (uint64_t)(calc_pll_cs->fract_fb_divider_factor); feedback_divider *= (uint64_t)(calc_pll_cs->fract_fb_divider_factor);
...@@ -145,8 +145,8 @@ static bool calculate_fb_and_fractional_fb_divider( ...@@ -145,8 +145,8 @@ static bool calculate_fb_and_fractional_fb_divider(
* of fractional feedback decimal point and the fractional FB Divider precision * of fractional feedback decimal point and the fractional FB Divider precision
* is 2 then the equation becomes (ullfeedbackDivider + 5*100) / (10*100))*/ * is 2 then the equation becomes (ullfeedbackDivider + 5*100) / (10*100))*/
feedback_divider += (uint64_t) feedback_divider += 5ULL *
(5 * calc_pll_cs->fract_fb_divider_precision_factor); calc_pll_cs->fract_fb_divider_precision_factor;
feedback_divider = feedback_divider =
div_u64(feedback_divider, div_u64(feedback_divider,
calc_pll_cs->fract_fb_divider_precision_factor * 10); calc_pll_cs->fract_fb_divider_precision_factor * 10);
...@@ -203,8 +203,8 @@ static bool calc_fb_divider_checking_tolerance( ...@@ -203,8 +203,8 @@ static bool calc_fb_divider_checking_tolerance(
&fract_feedback_divider); &fract_feedback_divider);
/*Actual calculated value*/ /*Actual calculated value*/
actual_calc_clk_khz = (uint64_t)(feedback_divider * actual_calc_clk_khz = (uint64_t)feedback_divider *
calc_pll_cs->fract_fb_divider_factor) + calc_pll_cs->fract_fb_divider_factor +
fract_feedback_divider; fract_feedback_divider;
actual_calc_clk_khz *= calc_pll_cs->ref_freq_khz; actual_calc_clk_khz *= calc_pll_cs->ref_freq_khz;
actual_calc_clk_khz = actual_calc_clk_khz =
......
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