summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2019-11-01 10:00:35 +0000
committerDaniel Lezcano <daniel.lezcano@linaro.org>2019-11-07 07:00:26 +0100
commitf0a353b4d184b36a68e3d6951b5027a0c6c0c526 (patch)
treee4efe2adf551d8b7adb8f451c0e9b5dbb24d7e74
parent0cac7559f1b67aa29879ead6b6b6a856d963905f (diff)
downloadlinux-f0a353b4d184b36a68e3d6951b5027a0c6c0c526.tar.bz2
drivers: thermal: tsens: fix potential integer overflow on multiply
Currently a multiply operation is being performed on two int values and the result is being assigned to a u64, presumably because the end result is expected to be probably larger than an int. However, because the multiply is an int multiply one can get overflow. Avoid the overflow by casting degc to a u64 to force a u64 multiply. Also use div_u64 for the divide as suggested by Daniel Lezcano. Addresses-Coverity: ("Unintentional integer overflow") Fixes: fbfe1a042cfd ("drivers: thermal: tsens: Add interrupt support") Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org> Link: https://lore.kernel.org/r/20191101100035.25502-1-colin.king@canonical.com
-rw-r--r--drivers/thermal/qcom/tsens-common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c
index 4359a4247ac3..c8d57ee0a5bb 100644
--- a/drivers/thermal/qcom/tsens-common.c
+++ b/drivers/thermal/qcom/tsens-common.c
@@ -92,7 +92,7 @@ void compute_intercept_slope(struct tsens_priv *priv, u32 *p1,
static inline u32 degc_to_code(int degc, const struct tsens_sensor *s)
{
- u64 code = (degc * s->slope + s->offset) / SLOPE_FACTOR;
+ u64 code = div_u64(((u64)degc * s->slope + s->offset), SLOPE_FACTOR);
pr_debug("%s: raw_code: 0x%llx, degc:%d\n", __func__, code, degc);
return clamp_val(code, THRESHOLD_MIN_ADC_CODE, THRESHOLD_MAX_ADC_CODE);