mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "pang.xunlei" <pang.xunlei@linaro.org>
To: linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com
Cc: John Stultz <john.stultz@linaro.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Alessandro Zummo <a.zummo@towertech.it>,
	"pang.xunlei" <pang.xunlei@linaro.org>
Subject: [PATCH RFC 08/12] time: Add rtc_time_to_tm() safe version(using time64_t)
Date: Mon, 27 Oct 2014 13:46:38 +0800	[thread overview]
Message-ID: <1414388802-5866-7-git-send-email-pang.xunlei@linaro.org> (raw)
In-Reply-To: <1414388802-5866-1-git-send-email-pang.xunlei@linaro.org>

The kernel uses 32-bit signed value(time_t) for seconds since 1970-01-01:00:00:00, thus it
will overflow at 2038-01-19 03:14:08 on 32-bit systems. We call this "2038 safety" issue.

As part of addressing 2038 saftey for in-kernel uses, this patch adds the safe rtc_time_to_tm()
using time64_t. After this patch, rtc_time_to_tm_unsafe() should be replaced by rtc_time_to_tm()
one by one.

Eventually, rtc_time_to_tm_unsafe() will be removed from the kernel when it has no users.

Signed-off-by: pang.xunlei <pang.xunlei@linaro.org>
---
 drivers/rtc/rtc-lib.c |   18 ++++++++++++++----
 include/linux/rtc.h   |    1 +
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c
index 34bcca9..cbbc9a6 100644
--- a/drivers/rtc/rtc-lib.c
+++ b/drivers/rtc/rtc-lib.c
@@ -48,12 +48,12 @@ EXPORT_SYMBOL(rtc_year_days);
 /*
  * Convert seconds since 01-01-1970 00:00:00 to Gregorian date.
  */
-void rtc_time_to_tm_unsafe(unsigned long time, struct rtc_time *tm)
+void rtc_time_to_tm(time64_t time, struct rtc_time *tm)
 {
 	unsigned int month, year;
 	int days;
 
-	days = time / 86400;
+	days = div_s64(time, 86400);
 	time -= (unsigned int) days * 86400;
 
 	/* day of the week, 1970-01-01 was a Thursday */
@@ -81,13 +81,23 @@ void rtc_time_to_tm_unsafe(unsigned long time, struct rtc_time *tm)
 	tm->tm_mon = month;
 	tm->tm_mday = days + 1;
 
-	tm->tm_hour = time / 3600;
+	tm->tm_hour = div_s64(time, 3600);
 	time -= tm->tm_hour * 3600;
-	tm->tm_min = time / 60;
+	tm->tm_min = div_s64(time, 60);
 	tm->tm_sec = time - tm->tm_min * 60;
 
 	tm->tm_isdst = 0;
 }
+EXPORT_SYMBOL(rtc_time_to_tm);
+
+/* TODO: [2038 safety] unsafe for legacy, and should be replaced by rtc_time_to_tm() */
+void rtc_time_to_tm_unsafe(unsigned long time, struct rtc_time *tm)
+{
+	time64_t time64;
+
+	time64 = (time64_t)time;
+	rtc_time_to_tm(time64, tm);
+}
 EXPORT_SYMBOL(rtc_time_to_tm_unsafe);
 
 /*
diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index d1f878c..1994399 100644
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -21,6 +21,7 @@ extern int rtc_year_days(unsigned int day, unsigned int month, unsigned int year
 extern int rtc_valid_tm(struct rtc_time *tm);
 extern int rtc_tm_to_time(struct rtc_time *tm, time64_t *time);
 extern int rtc_tm_to_time_unsafe(struct rtc_time *tm, unsigned long *time);
+extern void rtc_time_to_tm(time64_t time, struct rtc_time *tm);
 extern void rtc_time_to_tm_unsafe(unsigned long time, struct rtc_time *tm);
 ktime_t rtc_tm_to_ktime(struct rtc_time tm);
 struct rtc_time rtc_ktime_to_tm(ktime_t kt);
-- 
1.7.9.5


  parent reply	other threads:[~2014-10-27  5:47 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-27  5:46 [PATCH RFC 02/12] time: Add mktime() " pang.xunlei
2014-10-27  5:46 ` [PATCH RFC 03/12] time: Rename rtc_tm_to_time() to rtc_tm_to_time_unsafe() pang.xunlei
2014-10-27  5:46 ` [PATCH RFC 04/12] time: Add rtc_tm_to_time() safe version(using time64_t) pang.xunlei
2014-10-27  5:46 ` [PATCH RFC 05/12] time: Convert rtc_tm_to_time_unsafe() to rtc_tm_to_time() in rtc_hctosys() pang.xunlei
2014-10-27 22:03   ` Thomas Gleixner
2014-10-27 22:13     ` Thomas Gleixner
2014-10-27  5:46 ` [PATCH RFC 06/12] time: Fix build warnings for time64_t to __kernel_time_t warning on 64-bit systems pang.xunlei
2014-10-27 21:41   ` Thomas Gleixner
2014-10-27  5:46 ` [PATCH RFC 07/12] time: Rename rtc_time_to_tm() to rtc_time_to_tm_unsafe() pang.xunlei
2014-10-27  5:46 ` pang.xunlei [this message]
2014-10-27  5:46 ` [PATCH RFC 09/12] time: Convert rtc_time_to_tm_unsafe() to rtc_time_to_tm() in alarm_set_rtc() pang.xunlei
2014-10-27  5:46 ` [PATCH RFC 10/12] time: Convert do_settimeofday() to use timespec64 pang.xunlei
2014-10-27  5:46 ` [PATCH RFC 11/12] time: Convert xen_read_wallclock() " pang.xunlei
     [not found]   ` <alpine.DEB.2.02.1410271525560.22875@kaball.uk.xensource.com>
2014-10-29 13:04     ` Xunlei Pang
2014-10-27  5:46 ` [PATCH RFC 12/12] time: Convert pvclock_read_wallclock() " pang.xunlei

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1414388802-5866-7-git-send-email-pang.xunlei@linaro.org \
    --to=pang.xunlei@linaro.org \
    --cc=a.zummo@towertech.it \
    --cc=john.stultz@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rtc-linux@googlegroups.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®