]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
PM / devfreq: tegra30: Fix integer overflow on CPU's freq max out
authorDmitry Osipenko <digetx@gmail.com>
Mon, 4 Nov 2019 21:56:03 +0000 (00:56 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Oct 2020 09:11:50 +0000 (11:11 +0200)
[ Upstream commit 53b4b2aeee26f42cde5ff2a16dd0d8590c51a55a ]

There is another kHz-conversion bug in the code, resulting in integer
overflow. Although, this time the resulting value is 4294966296 and it's
close to ULONG_MAX, which is okay in this case.

Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Tested-by: Peter Geis <pgwipeout@gmail.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/devfreq/tegra-devfreq.c

index 64a2e02b87d78c5ee2bc5932246982d9d1f40ad0..0b0de6a049afb05be3e87eb282b8a480888c662d 100644 (file)
@@ -79,6 +79,8 @@
 
 #define KHZ                                                    1000
 
+#define KHZ_MAX                                                (ULONG_MAX / KHZ)
+
 /* Assume that the bus is saturated if the utilization is 25% */
 #define BUS_SATURATION_RATIO                                   25
 
@@ -179,7 +181,7 @@ struct tegra_actmon_emc_ratio {
 };
 
 static struct tegra_actmon_emc_ratio actmon_emc_ratios[] = {
-       { 1400000, ULONG_MAX },
+       { 1400000,    KHZ_MAX },
        { 1200000,    750000 },
        { 1100000,    600000 },
        { 1000000,    500000 },