From: Haibo Chen Date: Mon, 17 Oct 2016 08:18:37 +0000 (+0200) Subject: mmc: sdhci: cast unsigned int to unsigned long long to avoid unexpeted error X-Git-Tag: v4.1.36~63 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f125e7f2285c2ec9a9f6039073e95ab65700fc74;p=platform%2Fkernel%2Flinux-exynos.git mmc: sdhci: cast unsigned int to unsigned long long to avoid unexpeted error [ Upstream commit 02265cd60335a2c1417abae4192611e1fc05a6e5 ] Potentially overflowing expression 1000000 * data->timeout_clks with type unsigned int is evaluated using 32-bit arithmetic, and then used in a context that expects an expression of type unsigned long long. To avoid overflow, cast 1000000U to type unsigned long long. Special thanks to Coverity. Fixes: 7f05538af71c ("mmc: sdhci: fix data timeout (part 2)") Signed-off-by: Haibo Chen Cc: stable@vger.kernel.org # v3.15+ Acked-by: Adrian Hunter Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index c60dde917e49..5eb23ae82def 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -690,7 +690,7 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd) * host->clock is in Hz. target_timeout is in us. * Hence, us = 1000000 * cycles / Hz. Round up. */ - val = 1000000 * data->timeout_clks; + val = 1000000ULL * data->timeout_clks; if (do_div(val, host->clock)) target_timeout++; target_timeout += val;