Commit 02265cd6 authored Oct 17, 2016 by Haibo Chen Committed by Ulf Hansson Oct 17, 2016

mmc: sdhci: cast unsigned int to unsigned long long to avoid unexpeted error



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: 7f05538a ("mmc: sdhci: fix data timeout (part 2)")
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Cc: stable@vger.kernel.org # v3.15+
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 77da3da0

drivers/mmc/host/sdhci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -687,7 +687,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;

Admin message