Skip to content

Commit 5b51157

Browse files
Nikita Zhandarovichjlahtine-intel
authored andcommitted
drm/i915: Fix possible int overflow in skl_ddi_calculate_wrpll()
On the off chance that clock value ends up being too high (by means of skl_ddi_calculate_wrpll() having been called with big enough value of crtc_state->port_clock * 1000), one possible consequence may be that the result will not be able to fit into signed int. Fix this issue by moving conversion of clock parameter from kHz to Hz into the body of skl_ddi_calculate_wrpll(), as well as casting the same parameter to u64 type while calculating the value for AFE clock. This both mitigates the overflow problem and avoids possible erroneous integer promotion mishaps. Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE. Fixes: 82d3543 ("drm/i915/skl: Implementation of SKL DPLL programming") Cc: [email protected] Signed-off-by: Nikita Zhandarovich <[email protected]> Reviewed-by: Jani Nikula <[email protected]> Signed-off-by: Jani Nikula <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit 833cf12) Signed-off-by: Joonas Lahtinen <[email protected]>
1 parent 5550691 commit 5b51157

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/gpu/drm/i915/display/intel_dpll_mgr.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1658,7 +1658,7 @@ static void skl_wrpll_params_populate(struct skl_wrpll_params *params,
16581658
}
16591659

16601660
static int
1661-
skl_ddi_calculate_wrpll(int clock /* in Hz */,
1661+
skl_ddi_calculate_wrpll(int clock,
16621662
int ref_clock,
16631663
struct skl_wrpll_params *wrpll_params)
16641664
{
@@ -1683,7 +1683,7 @@ skl_ddi_calculate_wrpll(int clock /* in Hz */,
16831683
};
16841684
unsigned int dco, d, i;
16851685
unsigned int p0, p1, p2;
1686-
u64 afe_clock = clock * 5; /* AFE Clock is 5x Pixel clock */
1686+
u64 afe_clock = (u64)clock * 1000 * 5; /* AFE Clock is 5x Pixel clock, in Hz */
16871687

16881688
for (d = 0; d < ARRAY_SIZE(dividers); d++) {
16891689
for (dco = 0; dco < ARRAY_SIZE(dco_central_freq); dco++) {
@@ -1808,7 +1808,7 @@ static int skl_ddi_hdmi_pll_dividers(struct intel_crtc_state *crtc_state)
18081808
struct skl_wrpll_params wrpll_params = {};
18091809
int ret;
18101810

1811-
ret = skl_ddi_calculate_wrpll(crtc_state->port_clock * 1000,
1811+
ret = skl_ddi_calculate_wrpll(crtc_state->port_clock,
18121812
i915->display.dpll.ref_clks.nssc, &wrpll_params);
18131813
if (ret)
18141814
return ret;

0 commit comments

Comments
 (0)