Re: 2.6.17-rc6-rt1

[john stultz]

On Wed, 2006-06-07 at 23:14 +0200, Ingo Molnar wrote:
> if we accidentally dropped some fix in the process then please complain. 
> x86 and x86_64 build and boot, but some initial rough edges are to be 
> expected. Deepak, your ARM-GTOD patches are included but not tested yet.

Ingo,
	This fix will be needed in 2.6.17-rc6-rt1, as it includes the x86-64
TOD conversion (not yet in -mm).

I accidentally used the kernel-mapped vsyscall_gtod_data value, 
rather then the user-mapped __vsyscall_gtod_data value in do_get_tz.

This would cause gettimeofday to segfault when using a non-null 
timezone pointer.

Many thanks to Martin Murray, who pointed out this issue and its fix.

thanks
-john

Signed-off-by: John Stultz <johnstul@xxxxxxxxxx>

diff --git a/arch/x86_64/kernel/vsyscall.c b/arch/x86_64/kernel/vsyscall.c
index 98692a4..0bda23b 100644
--- a/arch/x86_64/kernel/vsyscall.c
+++ b/arch/x86_64/kernel/vsyscall.c
@@ -125,7 +125,7 @@ static __always_inline void do_vgettimeo
 /* RED-PEN may want to readd seq locking, but then the variable should be write-once. */
 static __always_inline void do_get_tz(struct timezone * tz)
 {
-	*tz = vsyscall_gtod_data.sys_tz;
+	*tz = __vsyscall_gtod_data.sys_tz;
 }
 
 static __always_inline int gettimeofday(struct timeval *tv, struct timezone *tz)


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/