Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Ingo Molnar:
"Fix a division by zero crash in the posix-timers code"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
posix-timers: Fix division by zero bug
+1
-4
+1
-4
kernel/time/posix-timers.c
+1
-4
kernel/time/posix-timers.c
···
289
289
{
290
290
struct hrtimer *timer = &timr->it.real.timer;
291
291
292
-
if (!timr->it_interval)
293
-
return;
294
-
295
292
timr->it_overrun += hrtimer_forward(timer, timer->base->get_time(),
296
293
timr->it_interval);
297
294
hrtimer_restart(timer);
···
314
317
if (!timr)
315
318
return;
316
319
317
-
if (timr->it_requeue_pending == info->si_sys_private) {
320
+
if (timr->it_interval && timr->it_requeue_pending == info->si_sys_private) {
318
321
timr->kclock->timer_rearm(timr);
319
322
320
323
timr->it_active = 1;