From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759347AbcGKP0C (ORCPT ); Mon, 11 Jul 2016 11:26:02 -0400 Received: from terminus.zytor.com ([198.137.202.10]:49146 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759223AbcGKP0A (ORCPT ); Mon, 11 Jul 2016 11:26:00 -0400 Date: Mon, 11 Jul 2016 08:25:49 -0700 From: tip-bot for Alexey Dobriyan Message-ID: Cc: tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, adobriyan@gmail.com Reply-To: linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, adobriyan@gmail.com, hpa@zytor.com In-Reply-To: <20160707223911.GA26483@p183.telecom.by> References: <20160707223911.GA26483@p183.telecom.by> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/urgent] posix_cpu_timer: Exit early when process has been reaped Git-Commit-ID: 2c13ce8f6b2f6fd9ba2f9261b1939fc0f62d1307 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 2c13ce8f6b2f6fd9ba2f9261b1939fc0f62d1307 Gitweb: http://git.kernel.org/tip/2c13ce8f6b2f6fd9ba2f9261b1939fc0f62d1307 Author: Alexey Dobriyan AuthorDate: Fri, 8 Jul 2016 01:39:11 +0300 Committer: Thomas Gleixner CommitDate: Mon, 11 Jul 2016 17:20:12 +0200 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 Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20160707223911.GA26483@p183.telecom.by Signed-off-by: Thomas Gleixner --- kernel/time/posix-cpu-timers.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c index 1cafba8..39008d7 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);