| 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
| ||
|
Message-Id: <1338400497-12420-1-git-send-email-john.stultz@linaro.org> Date: Wed, 30 May 2012 10:54:57 -0700 From: John Stultz <john.stultz@...aro.org> To: linux-kernel@...r.kernel.org Cc: John Stultz <john.stultz@...aro.org>, stable@...nel.org, Thomas Gleixner <tglx@...utronix.de> Subject: [PATCH] time: Fix CLOCK_MONOTONIC inconsistency during leapsecond Make sure we update wall_to_monotonic when adding a leapsecond. This could otherwise cause discontinuities in CLOCK_MONOTONIC. This fixes a regression caused by 6b43ae8a619d17c4935c3320d2ef9e92bdeed05d CC: stable@...nel.org CC: Thomas Gleixner <tglx@...utronix.de> Reported-by: Richard Cochran <richardcochran@...il.com> Tested-by: Richard Cochran <richardcochran@...il.com> Signed-off-by: John Stultz <john.stultz@...aro.org> --- kernel/time/timekeeping.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 6e46cac..6f46a00 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -962,6 +962,7 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift) timekeeper.xtime.tv_sec++; leap = second_overflow(timekeeper.xtime.tv_sec); timekeeper.xtime.tv_sec += leap; + timekeeper.wall_to_monotonic.tv_sec -= leap; } /* Accumulate raw time */ @@ -1077,6 +1078,7 @@ static void update_wall_time(void) timekeeper.xtime.tv_sec++; leap = second_overflow(timekeeper.xtime.tv_sec); timekeeper.xtime.tv_sec += leap; + timekeeper.wall_to_monotonic.tv_sec -= leap; } timekeeping_update(false); -- 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/
Powered by blists - more mailing lists