@@ -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,
@@ -560,6 +560,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;
+ struct itimerspec *rtn = old_setting64 ? &old_setting : NULL;
+ int ret;
+
+ new_setting = itimerspec64_to_itimerspec(new_setting64);
+ ret = kc->timer_set(timr, flags, &new_setting, rtn);
+ 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)
{
@@ -582,6 +599,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;
}
@@ -927,16 +946,16 @@ 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;
unsigned long flag;
struct k_clock *kc;
- if (!timespec_valid(&new_spec->it_interval) ||
- !timespec_valid(&new_spec->it_value))
+ if (!timespec64_valid(&new_spec->it_interval) ||
+ !timespec64_valid(&new_spec->it_value))
return -EINVAL;
retry:
@@ -945,10 +964,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) {
@@ -964,20 +983,20 @@ 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;
+ struct itimerspec64 new_spec, old_spec;
int error = 0;
- struct itimerspec *rtn = old_setting ? &old_spec : NULL;
+ struct itimerspec64 *rtn = old_setting ? &old_spec : NULL;
if (!new_setting)
return -EINVAL;
- if (copy_from_user(&new_spec, new_setting, sizeof (new_spec)))
+ if (get_itimerspec(&new_spec, new_setting))
return -EFAULT;
error = __timer_settime(timer_id, flags, &new_spec, rtn);
if (old_setting && !error &&
- copy_to_user(old_setting, &old_spec, sizeof (old_spec)))
+ put_itimerspec(&old_spec, old_setting))
error = -EFAULT;
return error;
The timer_set() callback in struct k_clock is not year 2038 safe on 32bit systems. To address this implement a new callback timer_set64() which uses struct itimerspec64 along with a default implementation which is a wrapper for the existing timer_set() callback. The default callback is installed at registration time for all posix clocks which are not yet converted to timer_set64() and will be removed once this is completed. Use the new callback in __timer_settime(). Signed-off-by: Baolin Wang <baolin.wang@linaro.org> --- include/linux/posix-timers.h | 3 +++ kernel/time/posix-timers.c | 39 +++++++++++++++++++++++++++++---------- 2 files changed, 32 insertions(+), 10 deletions(-)