* [PATCH v2] mmc: sdhci: cast unsigned int to unsigned long long to avoid unexpeted error
@ 2016-10-17 8:18 ` Haibo Chen
0 siblings, 0 replies; 4+ messages in thread
From: Haibo Chen @ 2016-10-17 8:18 UTC (permalink / raw)
To: adrian.hunter, ulf.hansson, rmk+kernel; +Cc: stable, linux-mmc, haibo.chen
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@nxp.com>
Cc: stable@vger.kernel.org # v3.15+
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v2] mmc: sdhci: cast unsigned int to unsigned long long to avoid unexpeted error
@ 2016-10-17 8:18 ` Haibo Chen
0 siblings, 0 replies; 4+ messages in thread
From: Haibo Chen @ 2016-10-17 8:18 UTC (permalink / raw)
To: adrian.hunter, ulf.hansson, rmk+kernel; +Cc: stable, linux-mmc, haibo.chen
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@nxp.com>
Cc: stable@vger.kernel.org # v3.15+
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] mmc: sdhci: cast unsigned int to unsigned long long to avoid unexpeted error
2016-10-17 8:18 ` Haibo Chen
(?)
@ 2016-10-17 8:13 ` Adrian Hunter
-1 siblings, 0 replies; 4+ messages in thread
From: Adrian Hunter @ 2016-10-17 8:13 UTC (permalink / raw)
To: Haibo Chen, ulf.hansson, rmk+kernel; +Cc: stable, linux-mmc
On 17/10/16 11:18, Haibo Chen 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@nxp.com>
> Cc: stable@vger.kernel.org # v3.15+
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
> 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;
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] mmc: sdhci: cast unsigned int to unsigned long long to avoid unexpeted error
2016-10-17 8:18 ` Haibo Chen
(?)
(?)
@ 2016-10-17 13:49 ` Ulf Hansson
-1 siblings, 0 replies; 4+ messages in thread
From: Ulf Hansson @ 2016-10-17 13:49 UTC (permalink / raw)
To: Haibo Chen; +Cc: Adrian Hunter, Russell King, # 4.0+, linux-mmc
On 17 October 2016 at 10:18, Haibo Chen <haibo.chen@nxp.com> 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@nxp.com>
> Cc: stable@vger.kernel.org # 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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-10-17 21:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-17 8:18 [PATCH v2] mmc: sdhci: cast unsigned int to unsigned long long to avoid unexpeted error Haibo Chen
2016-10-17 8:18 ` Haibo Chen
2016-10-17 8:13 ` Adrian Hunter
2016-10-17 13:49 ` Ulf Hansson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.