linux-kernel - [tip:sched/urgent] x86, tsc: Fix a preemption leak in restore_sched_clock

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]

Message-ID: <tip-55496c896b8a695140045099d4e0175cf09d4eae@git.kernel.org>
Date:	Sat, 11 Sep 2010 07:49:07 GMT
From:	tip-bot for Peter Zijlstra <peterz@...radead.org>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
	torvalds@...ux-foundation.org, nico-linux-20100709@...ottelius.org,
	a.p.zijlstra@...llo.nl, peterz@...radead.org, flo@...n.at,
	lenb@...nel.org, jbarnes@...tuousgeek.org,
	suresh.b.siddha@...el.com, tglx@...utronix.de, rjw@...k.pl,
	mingo@...e.hu
Subject: [tip:sched/urgent] x86, tsc: Fix a preemption leak in restore_sched_clock_state()

Commit-ID:  55496c896b8a695140045099d4e0175cf09d4eae
Gitweb:     http://git.kernel.org/tip/55496c896b8a695140045099d4e0175cf09d4eae
Author:     Peter Zijlstra <peterz@...radead.org>
AuthorDate: Fri, 10 Sep 2010 22:32:53 +0200
Committer:  Ingo Molnar <mingo@...e.hu>
CommitDate: Sat, 11 Sep 2010 09:47:07 +0200

x86, tsc: Fix a preemption leak in restore_sched_clock_state()

Doh, a real life genuine preemption leak..

This caused a suspend failure.

Reported-bisected-and-tested-by-the-invaluable: Jeff Chua <jeff.chua.linux@...il.com>
Acked-by: Suresh Siddha <suresh.b.siddha@...el.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: Rafael J. Wysocki <rjw@...k.pl>
Cc: Nico Schottelius <nico-linux-20100709@...ottelius.org>
Cc: Jesse Barnes <jbarnes@...tuousgeek.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Florian Pritz <flo@...n.at>
Cc: Suresh Siddha <suresh.b.siddha@...el.com>
Cc: Len Brown <lenb@...nel.org>
Cc: <stable@...nel.org> # Greg, please apply after: cd7240c ("x86, tsc, sched: Recompute cyc2ns_offset's during resume from")
sleep states
LKML-Reference: <1284150773.402.122.camel@...top>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
 arch/x86/kernel/tsc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index d632934..26a863a 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -655,7 +655,7 @@ void restore_sched_clock_state(void)
 
 	local_irq_save(flags);
 
-	get_cpu_var(cyc2ns_offset) = 0;
+	__get_cpu_var(cyc2ns_offset) = 0;
 	offset = cyc2ns_suspend - sched_clock();
 
 	for_each_possible_cpu(cpu)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/