]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/msm/dsi: fix 32-bit signed integer extension in pclk_rate calculation
authorJonathan Marek <jonathan@marek.ca>
Mon, 7 Oct 2024 05:01:49 +0000 (01:01 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 1 Nov 2024 00:52:33 +0000 (01:52 +0100)
[ Upstream commit 358b762400bd94db2a14a72dfcef74c7da6bd845 ]

When (mode->clock * 1000) is larger than (1<<31), int to unsigned long
conversion will sign extend the int to 64 bits and the pclk_rate value
will be incorrect.

Fix this by making the result of the multiplication unsigned.

Note that above (1<<32) would still be broken and require more changes, but
its unlikely anyone will need that anytime soon.

Fixes: c4d8cfe516dc ("drm/msm/dsi: add implementation for helper functions")
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/618434/
Link: https://lore.kernel.org/r/20241007050157.26855-2-jonathan@marek.ca
Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/msm/dsi/dsi_host.c

index c563ecf6e7b94d29384e799d7d7d7d4fb833b264..eb7cd96d9ece1b7035ce67889fd8186b2ca79932 100644 (file)
@@ -678,7 +678,7 @@ static unsigned long dsi_get_pclk_rate(struct msm_dsi_host *msm_host, bool is_bo
        struct drm_display_mode *mode = msm_host->mode;
        unsigned long pclk_rate;
 
-       pclk_rate = mode->clock * 1000;
+       pclk_rate = mode->clock * 1000u;
 
        /*
         * For bonded DSI mode, the current DRM mode has the complete width of the