Skip to content

Commit 470f47f

Browse files
Alexey Dobriyangregkh
authored andcommitted
posix_cpu_timer: Exit early when process has been reaped
commit 2c13ce8f6b2f6fd9ba2f9261b1939fc0f62d1307 upstream. Variable "now" seems to be genuinely used unintialized if branch if (CPUCLOCK_PERTHREAD(timer->it_clock)) { is not taken and branch if (unlikely(sighand == NULL)) { is taken. In this case the process has been reaped and the timer is marked as disarmed anyway. So none of the postprocessing of the sample is required. Return right away. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Link: http://lkml.kernel.org/r/20160707223911.GA26483@p183.telecom.by Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent d863bec commit 470f47f

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

kernel/time/posix-cpu-timers.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -808,6 +808,7 @@ static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec *itp)
808808
timer->it.cpu.expires = 0;
809809
sample_to_timespec(timer->it_clock, timer->it.cpu.expires,
810810
&itp->it_value);
811+
return;
811812
} else {
812813
cpu_timer_sample_group(timer->it_clock, p, &now);
813814
unlock_task_sighand(p, &flags);

0 commit comments

Comments
 (0)