linux-kernel - [tip:timers/urgent] timers: Invoke timer_start

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 29 Dec 2017 14:47:05 -0800
From:   tip-bot for Thomas Gleixner <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     peterz@...radead.org, anna-maria@...utronix.de, fweisbec@...il.com,
        hpa@...or.com, linux-kernel@...r.kernel.org, mingo@...nel.org,
        paulmck@...ux.vnet.ibm.com, bigeasy@...utronix.de,
        tglx@...utronix.de
Subject: [tip:timers/urgent] timers: Invoke timer_start_debug() where it
 makes sense

Commit-ID:  fd45bb77ad682be728d1002431d77b8c73342836
Gitweb:     https://git.kernel.org/tip/fd45bb77ad682be728d1002431d77b8c73342836
Author:     Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Fri, 22 Dec 2017 15:51:14 +0100
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Fri, 29 Dec 2017 23:13:10 +0100

timers: Invoke timer_start_debug() where it makes sense

The timer start debug function is called before the proper timer base is
set. As a consequence the trace data contains the stale CPU and flags
values.

Call the debug function after setting the new base and flags.

Fixes: 500462a9de65 ("timers: Switch to a non-cascading wheel")
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Frederic Weisbecker <fweisbec@...il.com>
Cc: Sebastian Siewior <bigeasy@...utronix.de>
Cc: stable@...r.kernel.org
Cc: rt@...utronix.de
Cc: Paul McKenney <paulmck@...ux.vnet.ibm.com>
Cc: Anna-Maria Gleixner <anna-maria@...utronix.de>
Link: https://lkml.kernel.org/r/20171222145337.792907137@linutronix.de

---
 kernel/time/timer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 6be576e..89a9e1b 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1007,8 +1007,6 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option
 	if (!ret && (options & MOD_TIMER_PENDING_ONLY))
 		goto out_unlock;
 
-	debug_activate(timer, expires);
-
 	new_base = get_target_base(base, timer->flags);
 
 	if (base != new_base) {
@@ -1032,6 +1030,8 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option
 		}
 	}
 
+	debug_activate(timer, expires);
+
 	timer->expires = expires;
 	/*
 	 * If 'idx' was calculated above and the base time did not advance