aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-05-23 02:14:45 -0400
committerThomas Gleixner <tglx@linutronix.de>2010-05-24 05:50:38 -0400
commitbd45b7a385c5ffd82c11a1d51880be18559e5ad9 (patch)
treed5fb7949b599a0a0aa86233d8c3118cc5b0bf9b9 /kernel
parentf4b87dee923342505e1ddba8d34ce9de33e75050 (diff)
timekeeping: Fix timezone update
commit 64ce4c2f (time: Clean up warp_clock()) breaks the timezone update in a very subtle way. To avoid the direct access to timekeeping internals it adds the timezone delta to the current time with timespec_add_safe(). This works nicely when the timezone delta is > 0. If timezone delta is < 0 then the wrap check in timespec_add_safe() triggers and timespec_add_safe() returns TIME_MAX and screws up timekeeping completely. The comment above timespec_add_safe() says: It's assumed that both values are valid (>= 0) Add the timezone seconds adjustment directly. Reported-by: Rafael J. Wysocki <rjw@sisk.pl> Tested-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: John Stultz <johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/time.c b/kernel/time.c
index 50612faa9baf..848b1c2ab09a 100644
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -132,10 +132,10 @@ SYSCALL_DEFINE2(gettimeofday, struct timeval __user *, tv,
132 */ 132 */
133static inline void warp_clock(void) 133static inline void warp_clock(void)
134{ 134{
135 struct timespec delta, adjust; 135 struct timespec adjust;
136 delta.tv_sec = sys_tz.tz_minuteswest * 60; 136
137 delta.tv_nsec = 0; 137 adjust = current_kernel_time();
138 adjust = timespec_add_safe(current_kernel_time(), delta); 138 adjust.tv_sec += sys_tz.tz_minuteswest * 60;
139 do_settimeofday(&adjust); 139 do_settimeofday(&adjust);
140} 140}
141 141