linux-kernel - [PATCH] time: Add locking to xtime access in get

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-next>] [day] [month] [year] [list]

Message-Id: <1304478708-1273-1-git-send-email-john.stultz@linaro.org>
Date:	Tue,  3 May 2011 20:11:48 -0700
From:	John Stultz <john.stultz@...aro.org>
To:	lkml <linux-kernel@...r.kernel.org>
Cc:	John Stultz <johnstul@...ibm.com>,
	Paul Mackerras <paulus@...ba.org>,
	"Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>,
	Anton Blanchard <anton@...ba.org>,
	Thomas Gleixner <tglx@...utronix.de>
Subject: [PATCH] time: Add locking to xtime access in get_seconds()

From: John Stultz <johnstul@...ibm.com>

So get_seconds() has always been lock free, with the assumption
that accessing a long will be atomic.

However, recently I came across an odd bug where time() access could
occasionally be inconsistent, but only on power7 hardware. The
same code paths on power6 or x86 could not reproduce the issue.

After adding careful debugging checks to any xtime manipulation, and
not seeing any inconsistencies on the kernel side, I realized that
with no locking in the get_seconds path, its could be that two
sequential calls to time() could be executed out of order on newer
hardware, causing the inconsistency to appear in userland.

After adding the following locking, the issue cannot be reproduced.

Wanted to run this by the power guys to make sure the theory above
sounds sane.

CC: Paul Mackerras <paulus@...ba.org>
CC: Paul E. McKenney <paulmck@...ux.vnet.ibm.com>
CC: Anton Blanchard <anton@...ba.org>
CC: Thomas Gleixner <tglx@...utronix.de>
Signed-off-by: John Stultz <johnstul@...ibm.com>
---
 kernel/time/timekeeping.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 8ad5d57..89c7582 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -975,7 +975,15 @@ EXPORT_SYMBOL_GPL(monotonic_to_bootbased);

 unsigned long get_seconds(void)
 {
-	return xtime.tv_sec;
+	unsigned long seq, now;
+
+	do {
+		seq = read_seqbegin(&xtime_lock);
+
+		now = xtime.tv_sec;
+	} while (read_seqretry(&xtime_lock, seq));
+
+	return now;
 }
 EXPORT_SYMBOL(get_seconds);

-- 
1.7.3.2.146.gca209

--
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/