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 09/12] time: Convert rtc_time_to_tm_unsafe() to rtc_time_to_tm() in alarm_set_rtc()
Date: Mon, 27 Oct 2014 13:46:39 +0800 [thread overview]
Message-ID: <1414388802-5866-8-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, so 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 creates no functional change
in existing users, and converts rtc_time_to_tm_unsafe() to rtc_time_to_tm().
Signed-off-by: pang.xunlei <pang.xunlei@linaro.org>
---
drivers/staging/android/alarm-dev.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/android/alarm-dev.c b/drivers/staging/android/alarm-dev.c
index 3f95f80e..e2729c8 100644
--- a/drivers/staging/android/alarm-dev.c
+++ b/drivers/staging/android/alarm-dev.c
@@ -152,16 +152,18 @@ static int alarm_wait(void)
return rv;
}
-static int alarm_set_rtc(struct timespec *ts)
+static int alarm_set_rtc(struct timespec64 *ts)
{
+ struct timespec ts32;
struct rtc_time new_rtc_tm;
struct rtc_device *rtc_dev;
unsigned long flags;
int rv = 0;
- rtc_time_to_tm_unsafe(ts->tv_sec, &new_rtc_tm);
+ rtc_time_to_tm(ts->tv_sec, &new_rtc_tm);
rtc_dev = alarmtimer_get_rtcdev();
- rv = do_settimeofday(ts);
+ ts32 = timespec64_to_timespec(*ts);
+ rv = do_settimeofday(&ts32);
if (rv < 0)
return rv;
if (rtc_dev)
@@ -201,6 +203,7 @@ static int alarm_get_time(enum android_alarm_type alarm_type,
static long alarm_do_ioctl(struct file *file, unsigned int cmd,
struct timespec *ts)
{
+ struct timespec64 ts64;
int rv = 0;
unsigned long flags;
enum android_alarm_type alarm_type = ANDROID_ALARM_IOCTL_TO_TYPE(cmd);
@@ -238,7 +241,8 @@ static long alarm_do_ioctl(struct file *file, unsigned int cmd,
rv = alarm_wait();
break;
case ANDROID_ALARM_SET_RTC:
- rv = alarm_set_rtc(ts);
+ ts64 = timespec_to_timespec64(*ts);
+ rv = alarm_set_rtc(&ts64);
break;
case ANDROID_ALARM_GET_TIME(0):
rv = alarm_get_time(alarm_type, ts);
--
1.7.9.5
next prev parent reply other threads:[~2014-10-27 5:48 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() safe version(using time64_t) 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 ` [PATCH RFC 08/12] time: Add rtc_time_to_tm() safe version(using time64_t) pang.xunlei
2014-10-27 5:46 ` pang.xunlei [this message]
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-8-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®