diff mbox

[RFC,v2,07/11] time: Convert alarm_set_rtc() to use timespec64

Message ID 1414667745-7703-8-git-send-email-pang.xunlei@linaro.org
State New
Headers show

Commit Message

pang.xunlei Oct. 30, 2014, 11:15 a.m. UTC 
As part of addressing 2038 saftey for in-kernel uses, this patch
creates no functional change, and converts alarm_set_rtc() to use
timespec64.

Signed-off-by: pang.xunlei <pang.xunlei@linaro.org>
---
 drivers/staging/android/alarm-dev.c |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

Comments

Thomas Gleixner Oct. 30, 2014, 2:52 p.m. UTC | #1 
On Thu, 30 Oct 2014, pang.xunlei wrote:
> +/*
> +* TODO: [2038 safety] alarm_do_ioctl() should be fixed to use timespec64,
> +*  once timespec64 is promoted to userspace.

Nonsense. You CANNOT 'FIX' this. The ioctl needs to stay as is because
you need to preserve the user space ABI.

It needs a new ioctl variant which handles timespec64.

Thanks,

	tglx

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
diff mbox

Patch

diff --git a/drivers/staging/android/alarm-dev.c b/drivers/staging/android/alarm-dev.c
index 01017ff..dfa24f0 100644
--- a/drivers/staging/android/alarm-dev.c
+++ b/drivers/staging/android/alarm-dev.c
@@ -152,19 +152,16 @@  static int alarm_wait(void)
 	return rv;
 }
 
-/* TODO: [2038 safety] alarm_set_rtc() uses timespec64 */
-static int alarm_set_rtc(struct timespec *ts)
+static int alarm_set_rtc(struct timespec64 *ts)
 {
-	struct timespec ts64;
 	struct rtc_time new_rtc_tm;
 	struct rtc_device *rtc_dev;
 	unsigned long flags;
 	int rv = 0;
 
-	ts64 = timespec_to_timespec64(*ts);
-	rtc_time_to_tm64(ts64.tv_sec, &new_rtc_tm);
+	rtc_time_to_tm64(ts->tv_sec, &new_rtc_tm);
 	rtc_dev = alarmtimer_get_rtcdev();
-	rv = do_settimeofday64(&ts64);
+	rv = do_settimeofday64(ts);
 	if (rv < 0)
 		return rv;
 	if (rtc_dev)
@@ -201,9 +198,14 @@  static int alarm_get_time(enum android_alarm_type alarm_type,
 	return rv;
 }
 
+/*
+* TODO: [2038 safety] alarm_do_ioctl() should be fixed to use timespec64,
+*  once timespec64 is promoted to userspace.
+*/
 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);
@@ -241,7 +243,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);