[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1449201674-24344-1-git-send-email-sasha.levin@oracle.com>
Date: Thu, 3 Dec 2015 23:01:14 -0500
From: Sasha Levin <sasha.levin@...cle.com>
To: a.zummo@...ertech.it, alexandre.belloni@...e-electrons.com
Cc: rtc-linux@...glegroups.com, linux-kernel@...r.kernel.org,
Sasha Levin <sasha.levin@...cle.com>
Subject: [PATCH v2] rtc: fix overflow and incorrect calculation in rtc_time64_to_tm
At some point after humans go extinct and robots cotrol the world, dividing
he time64_t by 86400 to extract the days will overflow a 32bit integer,
leading to incorrect conversion into rtc_time in rtc_time64_to_tm().
Signed-off-by: Sasha Levin <sasha.levin@...cle.com>
---
drivers/rtc/rtc-lib.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c
index e6bfb9c..cafae93 100644
--- a/drivers/rtc/rtc-lib.c
+++ b/drivers/rtc/rtc-lib.c
@@ -53,12 +53,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;
- int days;
+ int secs;
+ time64_t 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;
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists