summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2016-07-08 01:39:11 +0300
committerThomas Gleixner <tglx@linutronix.de>2016-07-11 17:20:12 +0200
commit2c13ce8f6b2f6fd9ba2f9261b1939fc0f62d1307 (patch)
tree66ac203de7a517209a0aaef052bfae57710d7de2 /kernel/time
parent92d21ac74a9e3c09b0b01c764e530657e4c85c49 (diff)
downloadlinux-stable-2c13ce8f6b2f6fd9ba2f9261b1939fc0f62d1307.tar.gz
linux-stable-2c13ce8f6b2f6fd9ba2f9261b1939fc0f62d1307.tar.bz2
linux-stable-2c13ce8f6b2f6fd9ba2f9261b1939fc0f62d1307.zip
posix_cpu_timer: Exit early when process has been reaped
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> Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20160707223911.GA26483@p183.telecom.by Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/posix-cpu-timers.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 1cafba860b08..39008d78927a 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -777,6 +777,7 @@ static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec *itp)
timer->it.cpu.expires = 0;
sample_to_timespec(timer->it_clock, timer->it.cpu.expires,
&itp->it_value);
+ return;
} else {
cpu_timer_sample_group(timer->it_clock, p, &now);
unlock_task_sighand(p, &flags);