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
| ||
|
Date: Tue, 17 Jul 2012 14:05:33 -0400 From: John Stultz <johnstul@...ibm.com> To: stable@...r.kernel.org Cc: Richard Cochran <richardcochran@...il.com>, Prarit Bhargava <prarit@...hat.com>, Thomas Gleixner <tglx@...utronix.de>, Linux Kernel <linux-kernel@...r.kernel.org>, John Stultz <john.stultz@...aro.org> Subject: [PATCH 02/11] 2.6.35.x: ntp: Correct TAI offset during leap second From: Richard Cochran <richardcochran@...il.com> This is a backport of dd48d708ff3e917f6d6b6c2b696c3f18c019feed When repeating a UTC time value during a leap second (when the UTC time should be 23:59:60), the TAI timescale should not stop. The kernel NTP code increments the TAI offset one second too late. This patch fixes the issue by incrementing the offset during the leap second itself. Signed-off-by: Richard Cochran <richardcochran@...il.com> Cc: Prarit Bhargava <prarit@...hat.com> Cc: Thomas Gleixner <tglx@...utronix.de> Cc: Linux Kernel <linux-kernel@...r.kernel.org> Signed-off-by: John Stultz <john.stultz@...aro.org> --- kernel/time/ntp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 67ef677..272e169 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -208,6 +208,7 @@ int second_overflow(unsigned long secs) if (secs % 86400 == 0) { leap = -1; time_state = TIME_OOP; + time_tai++; printk(KERN_NOTICE "Clock: inserting leap second 23:59:60 UTC\n"); } @@ -222,7 +223,6 @@ int second_overflow(unsigned long secs) } break; case TIME_OOP: - time_tai++; time_state = TIME_WAIT; break; -- 1.7.9.5 -- 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/
Powered by blists - more mailing lists