On 17 October 2016 at 10:18, Haibo Chen <haibo.chen@xxxxxxx> wrote:
> 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 <haibo.chen@xxxxxxx>
> Cc: stable@xxxxxxxxxxxxxxx # v3.15+
Thanks, applied for fixes!
Kind regards
Uffe
> ---
> drivers/mmc/host/sdhci.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 223a91e..71654b9 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -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;
> --
> 1.9.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
