This patch introduces the timer_set64 method with itimerspec64 type for k_clock
structure, that makes it ready for the 2038 year.
Convert to the 64bit method with itimerspec64 type for the timer_settime
syscall function, and change the timer_settime syscall implementation according to
the CONFIG_64BIT macro.
Also add a default 64bit method for the timer_set64 pointer of k_clock structure,
and it will be removed after all the drivers are converted to 64bit methods.
Signed-off-by: Baolin Wang <[email protected]>
---
include/linux/posix-timers.h | 3 +++
kernel/time/posix-timers.c | 46 +++++++++++++++++++++++++++++++++++++-----
2 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index e84436b..16c3364 100644
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -109,6 +109,9 @@ struct k_clock {
int (*timer_set) (struct k_itimer * timr, int flags,
struct itimerspec * new_setting,
struct itimerspec * old_setting);
+ int (*timer_set64) (struct k_itimer *timr, int flags,
+ struct itimerspec64 *new_setting,
+ struct itimerspec64 *old_setting);
int (*timer_del) (struct k_itimer * timr);
#define TIMER_RETRY 1
void (*timer_get) (struct k_itimer * timr,
diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index d289846..e7b98f9 100644
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -524,6 +524,23 @@ static void default_timer_get64(struct k_itimer *timr,
*cur_setting64 = itimerspec_to_itimerspec64(&cur_setting);
}
+static int default_timer_set64(struct k_itimer *timr, int flags,
+ struct itimerspec64 *new_setting64,
+ struct itimerspec64 *old_setting64)
+{
+ struct k_clock *kc = clockid_to_kclock(timr->it_clock);
+ struct itimerspec new_setting, old_setting;
+ int ret;
+
+ new_setting = itimerspec64_to_itimerspec(new_setting64);
+ old_setting = itimerspec64_to_itimerspec(old_setting64);
+ ret = kc->timer_set(timr, flags, &new_setting, &old_setting);
+ if (!ret && old_setting64)
+ *old_setting64 = itimerspec_to_itimerspec64(&old_setting);
+
+ return ret;
+}
+
void posix_timers_register_clock(const clockid_t clock_id,
struct k_clock *new_clock)
{
@@ -546,6 +563,8 @@ void posix_timers_register_clock(const clockid_t clock_id,
if (new_clock->timer_get && !new_clock->timer_get64)
new_clock->timer_get64 = default_timer_get64;
+ if (new_clock->timer_set && !new_clock->timer_set64)
+ new_clock->timer_set64 = default_timer_set64;
posix_clocks[clock_id] = *new_clock;
}
@@ -899,8 +918,8 @@ common_timer_set(struct k_itimer *timr, int flags,
return 0;
}
-static int __timer_settime(timer_t timer_id, int flags, struct itimerspec *new_spec,
- struct itimerspec *old_spec)
+static int __timer_settime(timer_t timer_id, int flags, struct itimerspec64 *new_spec,
+ struct itimerspec64 *old_spec)
{
struct k_itimer *timr;
int error = 0;
@@ -913,10 +932,10 @@ retry:
return -EINVAL;
kc = clockid_to_kclock(timr->it_clock);
- if (WARN_ON_ONCE(!kc || !kc->timer_set))
+ if (WARN_ON_ONCE(!kc || !kc->timer_set64))
error = -EINVAL;
else
- error = kc->timer_set(timr, flags, new_spec, old_spec);
+ error = kc->timer_set64(timr, flags, new_spec, old_spec);
unlock_timer(timr, flag);
if (error == TIMER_RETRY) {
@@ -932,9 +951,16 @@ SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
const struct itimerspec __user *, new_setting,
struct itimerspec __user *, old_setting)
{
- struct itimerspec new_spec, old_spec;
int error = 0;
+#ifdef CONFIG_64BIT
+ struct itimerspec64 new_spec, old_spec;
+ struct itimerspec64 *rtn = old_setting ? &old_spec : NULL;
+#else
+ struct itimerspec new_spec, old_spec;
struct itimerspec *rtn = old_setting ? &old_spec : NULL;
+ struct itimerspec64 new_spec64;
+ struct itimerspec64 *rtn64;
+#endif
if (!new_setting)
return -EINVAL;
@@ -946,7 +972,17 @@ SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
!timespec_valid(&new_spec.it_value))
return -EINVAL;
+#ifdef CONFIG_64BIT
error = __timer_settime(timer_id, flags, &new_spec, rtn);
+#else
+ new_spec64 = itimerspec_to_itimerspec64(&new_spec);
+ if (rtn)
+ *rtn64 = itimerspec_to_itimerspec64(rtn);
+ else
+ rtn64 = NULL;
+
+ error = __timer_settime(timer_id, flags, &new_spec64, rtn64);
+#endif
if (old_setting && !error &&
copy_to_user(old_setting, &old_spec, sizeof (old_spec)))
--
1.7.9.5
On Tuesday 12 May 2015 22:10:14 Baolin Wang wrote:
> +static int default_timer_set64(struct k_itimer *timr, int flags,
> + struct itimerspec64 *new_setting64,
> + struct itimerspec64 *old_setting64)
> +{
> + struct k_clock *kc = clockid_to_kclock(timr->it_clock);
> + struct itimerspec new_setting, old_setting;
> + int ret;
> +
> + new_setting = itimerspec64_to_itimerspec(new_setting64);
> + old_setting = itimerspec64_to_itimerspec(old_setting64);
> + ret = kc->timer_set(timr, flags, &new_setting, &old_setting);
> + if (!ret && old_setting64)
> + *old_setting64 = itimerspec_to_itimerspec64(&old_setting);
> +
> + return ret;
> +}
>
You check old_setting64 for a NULL pointer in the second access, but not
in the first one, which is a bug. Please also check whether the variable
is used as input, output or both.
Arnd