[BACKPORT,4.14.y,5/8] rtc: Fix overflow when converting time64_t to rtc_time

Message ID 20190322161727.1153278-6-arnd@arndb.de
State New
Headers show
Series
  • [BACKPORT,4.14.y,1/8] scsi: ufs: fix wrong command type of UTRD for UFSHCI v2.1
Related show

Commit Message

Arnd Bergmann March 22, 2019, 4:17 p.m.
From: Baolin Wang <baolin.wang@linaro.org>


If we convert one large time values to rtc_time, in the original formula
'days * 86400' can be overflowed in 'unsigned int' type to make the formula
get one incorrect remain seconds value. Thus we can use div_s64_rem()
function to avoid this situation.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>

Acked-by: Arnd Bergmann <arnd@arndb.de>

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

(cherry picked from commit 36d46cdb43efea74043e29e2a62b13e9aca31452)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/rtc/rtc-lib.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

-- 
2.20.0

Patch

diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c
index 1ae7da5cfc60..ad5bb21908e5 100644
--- a/drivers/rtc/rtc-lib.c
+++ b/drivers/rtc/rtc-lib.c
@@ -52,13 +52,11 @@  EXPORT_SYMBOL(rtc_year_days);
  */
 void rtc_time64_to_tm(time64_t time, struct rtc_time *tm)
 {
-	unsigned int month, year;
-	unsigned long secs;
+	unsigned int month, year, secs;
 	int days;
 
 	/* time must be positive */
-	days = div_s64(time, 86400);
-	secs = time - (unsigned int) days * 86400;
+	days = div_s64_rem(time, 86400, &secs);
 
 	/* day of the week, 1970-01-01 was a Thursday */
 	tm->tm_wday = (days + 4) % 7;