hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

posix-timers: Make forward callback return s64 

The posix timer ti_overrun handling is broken because the forwarding
functions can return a huge number of overruns which does not fit in an
int. As a consequence timer_getoverrun(2) and siginfo::si_overrun can turn
into random number generators.

As a first step to address that let the timer_forward() callbacks return
the full 64 bit value.

Cast it to (int) temporarily until k_itimer::ti_overrun is converted to
64bit and the conversion to user space visible values is sanitized.

Reported-by: Team OWL337 <icytxw@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: John Stultz <john.stultz@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Michael Kerrisk <mtk.manpages@gmail.com>
Link: https://lkml.kernel.org/r/20180626132704.922098090@linutronix.de
This commit is contained in:
Thomas Gleixner 2018-06-26 15:21:31 +02:00
parent 6ff8473507
commit 6fec64e1c9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/time/alarmtimer.c
View File

@ -581,11 +581,11 @@ static void alarm_timer_rearm(struct k_itimer *timr)
* @timr: Pointer to the posixtimer data struct * @timr: Pointer to the posixtimer data struct
* @now: Current time to forward the timer against * @now: Current time to forward the timer against
*/ */
static int alarm_timer_forward(struct k_itimer *timr, ktime_t now) static s64 alarm_timer_forward(struct k_itimer *timr, ktime_t now)
{ {
struct alarm *alarm = &timr->it.alarm.alarmtimer; struct alarm *alarm = &timr->it.alarm.alarmtimer;
return (int) alarm_forward(alarm, timr->it_interval, now); return alarm_forward(alarm, timr->it_interval, now);
} }
/** /**

6
kernel/time/posix-timers.c
View File

@ -645,11 +645,11 @@ static ktime_t common_hrtimer_remaining(struct k_itimer *timr, ktime_t now)
return __hrtimer_expires_remaining_adjusted(timer, now); return __hrtimer_expires_remaining_adjusted(timer, now);
} }
static int common_hrtimer_forward(struct k_itimer *timr, ktime_t now) static s64 common_hrtimer_forward(struct k_itimer *timr, ktime_t now)
{ {
struct hrtimer *timer = &timr->it.real.timer; struct hrtimer *timer = &timr->it.real.timer;
return (int)hrtimer_forward(timer, now, timr->it_interval); return hrtimer_forward(timer, now, timr->it_interval);
} }
/* /*
@ -702,7 +702,7 @@ void common_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting)
* expiry time forward by intervals, so expiry is > now. * expiry time forward by intervals, so expiry is > now.
*/ */
if (iv && (timr->it_requeue_pending & REQUEUE_PENDING || sig_none)) if (iv && (timr->it_requeue_pending & REQUEUE_PENDING || sig_none))
timr->it_overrun += kc->timer_forward(timr, now); timr->it_overrun += (int)kc->timer_forward(timr, now);
remaining = kc->timer_remaining(timr, now); remaining = kc->timer_remaining(timr, now);
/* Return 0 only, when the timer is expired and not pending */ /* Return 0 only, when the timer is expired and not pending */

2
kernel/time/posix-timers.h
View File

@ -19,7 +19,7 @@ struct k_clock {
void (*timer_get)(struct k_itimer *timr, void (*timer_get)(struct k_itimer *timr,
struct itimerspec64 *cur_setting); struct itimerspec64 *cur_setting);
void (*timer_rearm)(struct k_itimer *timr); void (*timer_rearm)(struct k_itimer *timr);
int (*timer_forward)(struct k_itimer *timr, ktime_t now); s64 (*timer_forward)(struct k_itimer *timr, ktime_t now);
ktime_t (*timer_remaining)(struct k_itimer *timr, ktime_t now); ktime_t (*timer_remaining)(struct k_itimer *timr, ktime_t now);
int (*timer_try_to_cancel)(struct k_itimer *timr); int (*timer_try_to_cancel)(struct k_itimer *timr);
void (*timer_arm)(struct k_itimer *timr, ktime_t expires, void (*timer_arm)(struct k_itimer *timr, ktime_t expires,